Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-04 18:09:54 +01:00
Code Issues Projects Releases Wiki Activity

Add per warp command costs

Browse Source 
Make warp other commands charge the commander, not the warped.
This commit is contained in:
KHobbits 2012-02-13 17:09:07 +00:00
parent 2d56de1483
commit 2699e02f96
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
View File

@ -8,6 +8,7 @@ import com.earth2me.essentials.Warps;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@ -44,10 +45,10 @@ public class Commandwarp extends EssentialsCommand
{ {
throw new Exception(_("playerNotFound")); throw new Exception(_("playerNotFound"));
} }
warpUser(otherUser, args[0]); warpUser(user, otherUser, args[0]);
throw new NoChargeException(); throw new NoChargeException();
} }
warpUser(user, args[0]); warpUser(user, user, args[0]);
throw new NoChargeException(); throw new NoChargeException();
} }
} }
@ -65,7 +66,7 @@ public class Commandwarp extends EssentialsCommand
{ {
throw new Exception(_("playerNotFound")); throw new Exception(_("playerNotFound"));
} }
warpUser(otherUser, args[0]); otherUser.getTeleport().warp(args[0], null, TeleportCause.COMMAND);
throw new NoChargeException(); throw new NoChargeException();
} }
@ -112,17 +113,12 @@ public class Commandwarp extends EssentialsCommand
} }
} }
private void warpUser(final User user, final String name) throws Exception private void warpUser(final User owner, final User user, final String name) throws Exception
{ {
final Trade charge = new Trade(this.getName(), ess); final Trade charge = new Trade("warp-" + name.toLowerCase(Locale.ENGLISH).replace('_', '-'), ess);
charge.isAffordableFor(user); charge.isAffordableFor(owner);
if (ess.getSettings().getPerWarpPermission()) if (ess.getSettings().getPerWarpPermission() && !owner.isAuthorized("essentials.warp." + name))
{ {
if (user.isAuthorized("essentials.warp." + name))
{
user.getTeleport().warp(name, charge, TeleportCause.COMMAND);
return;
}
throw new Exception(_("warpUsePermission")); throw new Exception(_("warpUsePermission"));
} }
user.getTeleport().warp(name, charge, TeleportCause.COMMAND); user.getTeleport().warp(name, charge, TeleportCause.COMMAND);