TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-04-25 07:59:44 +00:00
Code Issues Projects Releases Wiki Activity

Check command cost permissions prior to teleporting. Fixes ESS-4918

Browse source
This commit is contained in:
KHobbits 2013-12-21 23:19:58 +00:00
parent bcd5350a4d
commit ad2f446602
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Essentials/src/com/earth2me/essentials/Teleport.java
View file

@ -7,7 +7,6 @@ import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import net.ess3.api.IEssentials; import net.ess3.api.IEssentials;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerRespawnEvent;
@ -153,26 +152,29 @@ public class Teleport implements net.ess3.api.ITeleport
{ {
double delay = ess.getSettings().getTeleportDelay(); double delay = ess.getSettings().getTeleportDelay();
Trade cashCharge = null;
if (chargeFor != null) if (chargeFor != null)
{ {
chargeFor.isAffordableFor(teleportOwner); chargeFor.isAffordableFor(teleportOwner);
cashCharge = new Trade(chargeFor.getCommandCost(teleportOwner), ess);
} }
cooldown(true); cooldown(true);
if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass") if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass")
|| teleportee.isAuthorized("essentials.teleport.timer.bypass")) || teleportee.isAuthorized("essentials.teleport.timer.bypass"))
{ {
cooldown(false); cooldown(false);
now(teleportee, target, cause); now(teleportee, target, cause);
if (chargeFor != null) if (cashCharge != null)
{ {
chargeFor.charge(teleportOwner); cashCharge.charge(teleportOwner);
} }
return; return;
} }
cancel(false); cancel(false);
warnUser(teleportee, delay); warnUser(teleportee, delay);
initTimer((long)(delay * 1000.0), teleportee, target, chargeFor, cause, false); initTimer((long)(delay * 1000.0), teleportee, target, cashCharge, cause, false);
} }
//The respawn function is a wrapper used to handle tp fallback, on /jail and /home //The respawn function is a wrapper used to handle tp fallback, on /jail and /home