mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-10-04 15:56:01 +00:00
[trunk warps should charge only once, and not when an exception happens
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1344 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
parent
27dffd1533
commit
cf020d235e
|
@ -87,11 +87,12 @@ public class Teleport implements Runnable
|
||||||
user.sendMessage("§7Teleportation commencing...");
|
user.sendMessage("§7Teleportation commencing...");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
|
now(teleportTarget);
|
||||||
if (chargeFor != null)
|
if (chargeFor != null)
|
||||||
{
|
{
|
||||||
user.charge(chargeFor);
|
user.charge(chargeFor);
|
||||||
}
|
}
|
||||||
now(teleportTarget);
|
|
||||||
}
|
}
|
||||||
catch (Throwable ex)
|
catch (Throwable ex)
|
||||||
{
|
{
|
||||||
|
@ -188,11 +189,11 @@ public class Teleport implements Runnable
|
||||||
cooldown(true);
|
cooldown(true);
|
||||||
if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
|
if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
|
||||||
{
|
{
|
||||||
|
now(target);
|
||||||
if (chargeFor != null)
|
if (chargeFor != null)
|
||||||
{
|
{
|
||||||
user.charge(chargeFor);
|
user.charge(chargeFor);
|
||||||
}
|
}
|
||||||
now(target);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -65,6 +65,7 @@ public class Commandwarp extends EssentialsCommand
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
warpUser(otherUser, args[0]);
|
warpUser(otherUser, args[0]);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
warpUser(user, args[0]);
|
warpUser(user, args[0]);
|
||||||
}
|
}
|
||||||
|
@ -76,14 +77,12 @@ public class Commandwarp extends EssentialsCommand
|
||||||
{
|
{
|
||||||
if (user.isAuthorized("essentials.warp." + name))
|
if (user.isAuthorized("essentials.warp." + name))
|
||||||
{
|
{
|
||||||
charge(user);
|
|
||||||
user.getTeleport().warp(name, this.getName());
|
user.getTeleport().warp(name, this.getName());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
user.sendMessage("§cYou do not have Permission to use that warp.");
|
user.sendMessage("§cYou do not have Permission to use that warp.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
charge(user);
|
|
||||||
user.getTeleport().warp(name, this.getName());
|
user.getTeleport().warp(name, this.getName());
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue