summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-02-28 12:52:22 +0000
committerKHobbits <rob@khobbits.co.uk>2013-02-28 12:52:22 +0000
commit55a1e40bf2edd918b0b846805578ead24723a8a0 (patch)
treeab4e98633ded94bfafdad69ad2fed5c49bce2ff3
parent120c14e72b7967fc692f5610d909d33d8e07ccdf (diff)
downloadEssentials-55a1e40bf2edd918b0b846805578ead24723a8a0.tar
Essentials-55a1e40bf2edd918b0b846805578ead24723a8a0.tar.gz
Essentials-55a1e40bf2edd918b0b846805578ead24723a8a0.tar.lz
Essentials-55a1e40bf2edd918b0b846805578ead24723a8a0.tar.xz
Essentials-55a1e40bf2edd918b0b846805578ead24723a8a0.zip
[Fix] Charging players at wrong point in /spawn
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
index 6335d6c69..31882cc4a 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
@@ -4,6 +4,7 @@ import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import com.earth2me.essentials.commands.EssentialsCommand;
+import com.earth2me.essentials.commands.NoChargeException;
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
import org.bukkit.Location;
import org.bukkit.Server;
@@ -26,7 +27,7 @@ public class Commandspawn extends EssentialsCommand
if (args.length > 0 && user.isAuthorized("essentials.spawn.others"))
{
final User otherUser = getPlayer(server, args, 0);
- respawn(otherUser, null);
+ respawn(otherUser, charge);
if (!otherUser.equals(user))
{
otherUser.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
@@ -35,8 +36,9 @@ public class Commandspawn extends EssentialsCommand
}
else
{
- respawn(user, null);
+ respawn(user, charge);
}
+ throw new NoChargeException();
}
@Override