TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-23 05:53:54 +00:00
Code Issues Projects Releases Wiki Activity

The /tpahere command now stores the location of 'here' rather than using the current players location.

Browse source 
Cleanup teleport logic - This also fixes exploiting /tpahere to get accesses to restricted areas.
This commit is contained in:
KHobbits 2013-08-11 16:37:21 +01:00
parent 4cfa3fc3a2
commit 7401608cc5
7 changed files with 32 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
View file

@ -1,6 +1,8 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.ITarget;
import com.earth2me.essentials.PlayerTarget;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import org.bukkit.Server;
@ -18,28 +20,28 @@ public class Commandtpaccept extends EssentialsCommand
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
final User target = ess.getUser(user.getTeleportRequest());
final User requester = ess.getUser(user.getTeleportRequest());
if (target == null || !target.isOnline())
if (requester == null || !requester.isOnline())
{
throw new Exception(_("noPendingRequest"));
}
if (user.isTpRequestHere() && ((!target.isAuthorized("essentials.tpahere") && !target.isAuthorized("essentials.tpaall"))
|| (user.getWorld() != target.getWorld() && ess.getSettings().isWorldTeleportPermissions()
if (user.isTpRequestHere() && ((!requester.isAuthorized("essentials.tpahere") && !requester.isAuthorized("essentials.tpaall"))
|| (user.getWorld() != requester.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !user.isAuthorized("essentials.worlds." + user.getWorld().getName()))))
{
throw new Exception(_("noPendingRequest"));
}
if (!user.isTpRequestHere() && (!target.isAuthorized("essentials.tpa")
|| (user.getWorld() != target.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !user.isAuthorized("essentials.worlds." + target.getWorld().getName()))))
if (!user.isTpRequestHere() && (!requester.isAuthorized("essentials.tpa")
|| (user.getWorld() != requester.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !user.isAuthorized("essentials.worlds." + requester.getWorld().getName()))))
{
throw new Exception(_("noPendingRequest"));
}
if (args.length > 0 && !target.getName().contains(args[0]))
if (args.length > 0 && !requester.getName().contains(args[0]))
{
throw new Exception(_("noPendingRequest"));
}
@ -53,23 +55,23 @@ public class Commandtpaccept extends EssentialsCommand
final Trade charge = new Trade(this.getName(), ess);
user.sendMessage(_("requestAccepted"));
target.sendMessage(_("requestAcceptedFrom", user.getDisplayName()));
requester.sendMessage(_("requestAcceptedFrom", user.getDisplayName()));
try
{
if (user.isTpRequestHere())
{
target.getTeleport().teleportToMe(user, charge, TeleportCause.COMMAND);
requester.getTeleport().teleportPlayer(user, user.getTpRequestLocation(), charge, TeleportCause.COMMAND);
}
else
{
target.getTeleport().teleport(user.getBase(), charge, TeleportCause.COMMAND);
requester.getTeleport().teleport(user.getBase(), charge, TeleportCause.COMMAND);
}
}
catch (Exception ex)
{
user.sendMessage(_("pendingTeleportCancelled"));
ess.showError(target.getBase(), ex, commandLabel);
ess.showError(requester.getBase(), ex, commandLabel);
}
user.requestTeleport(null, false);
throw new NoChargeException();