EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Clean up /ptp a bit more.

Browse Source
This commit is contained in:
GJ 2013-02-13 19:29:46 -05:00
parent dda9c82940
commit 25a54ea802
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java
View File

@ -84,7 +84,7 @@ public class PtpCommand implements CommandExecutor {
}
if (!mcMMOTarget.getPtpConfirmRequired()) {
return handlePartyTeleportEvent(player, target);
return handlePartyTeleportEvent();
}
mcMMOTarget.setPtpRequest(player);
@ -111,9 +111,10 @@ public class PtpCommand implements CommandExecutor {
return true;
}
Player requestTarget = mcMMOPlayer.getPtpRequest();
target = mcMMOPlayer.getPtpRequest();
if (!canTeleport(requestTarget.getName())) {
if (!canTeleport(target.getName())) {
mcMMOPlayer.removePtpRequest();
return true;
}
@ -121,17 +122,17 @@ public class PtpCommand implements CommandExecutor {
if (Config.getInstance().getPTPCommandWorldPermissions()) {
String perm = "mcmmo.commands.ptp.world.";
if (!Permissions.hasDynamicPermission(requestTarget, perm + "all", "op")) {
if (!Permissions.hasDynamicPermission(requestTarget, perm + requestTarget.getWorld().getName(), "op")) {
if (!Permissions.hasDynamicPermission(target, perm + "all", "op")) {
if (!Permissions.hasDynamicPermission(target, perm + target.getWorld().getName(), "op")) {
return true;
}
else if (requestTarget.getWorld() != player.getWorld() && !Permissions.hasDynamicPermission(requestTarget, perm + player.getWorld().getName(), "op")) {
else if (target.getWorld() != player.getWorld() && !Permissions.hasDynamicPermission(target, perm + player.getWorld().getName(), "op")) {
return true;
}
}
}
return handlePartyTeleportEvent(player, requestTarget);
return handlePartyTeleportEvent();
}
private boolean acceptAnyTeleportRequest() {
@ -196,7 +197,7 @@ public class PtpCommand implements CommandExecutor {
return true;
}
private boolean handlePartyTeleportEvent(Player player, Player target) {
private boolean handlePartyTeleportEvent() {
McMMOPlayer mcMMOPlayer= Users.getPlayer(player);
McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, mcMMOPlayer.getParty().getName());