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

Attempt to clarify the /ptp code - I don't know that this helps much.

Browse Source
This commit is contained in:
GJ 2013-02-13 18:58:17 -05:00
parent 55b88f0274
commit dda9c82940
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ public class PtpCommand implements CommandExecutor {
} }
if (!mcMMOTarget.getPtpConfirmRequired()) { if (!mcMMOTarget.getPtpConfirmRequired()) {
return handlePartyTeleportEvent(); return handlePartyTeleportEvent(player, target);
} }
mcMMOTarget.setPtpRequest(player); mcMMOTarget.setPtpRequest(player);
@ -111,9 +111,9 @@ public class PtpCommand implements CommandExecutor {
return true; return true;
} }
Player target = mcMMOPlayer.getPtpRequest(); Player requestTarget = mcMMOPlayer.getPtpRequest();
if (!canTeleport(target.getName())) { if (!canTeleport(requestTarget.getName())) {
return true; return true;
} }
@ -121,17 +121,17 @@ public class PtpCommand implements CommandExecutor {
if (Config.getInstance().getPTPCommandWorldPermissions()) { if (Config.getInstance().getPTPCommandWorldPermissions()) {
String perm = "mcmmo.commands.ptp.world."; String perm = "mcmmo.commands.ptp.world.";
if (!Permissions.hasDynamicPermission(target, perm + "all", "op")) { if (!Permissions.hasDynamicPermission(requestTarget, perm + "all", "op")) {
if (!Permissions.hasDynamicPermission(target, perm + target.getWorld().getName(), "op")) { if (!Permissions.hasDynamicPermission(requestTarget, perm + requestTarget.getWorld().getName(), "op")) {
return true; return true;
} }
else if (target.getWorld() != player.getWorld() && !Permissions.hasDynamicPermission(target, perm + player.getWorld().getName(), "op")) { else if (requestTarget.getWorld() != player.getWorld() && !Permissions.hasDynamicPermission(requestTarget, perm + player.getWorld().getName(), "op")) {
return true; return true;
} }
} }
} }
return handlePartyTeleportEvent(); return handlePartyTeleportEvent(player, requestTarget);
} }
private boolean acceptAnyTeleportRequest() { private boolean acceptAnyTeleportRequest() {
@ -196,7 +196,9 @@ public class PtpCommand implements CommandExecutor {
return true; return true;
} }
private boolean handlePartyTeleportEvent() { private boolean handlePartyTeleportEvent(Player player, Player target) {
McMMOPlayer mcMMOPlayer= Users.getPlayer(player);
McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, mcMMOPlayer.getParty().getName()); McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, mcMMOPlayer.getParty().getName());
mcMMO.p.getServer().getPluginManager().callEvent(event); mcMMO.p.getServer().getPluginManager().callEvent(event);
@ -207,7 +209,7 @@ public class PtpCommand implements CommandExecutor {
player.teleport(target); player.teleport(target);
player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", player.getName())); player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", player.getName()));
target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", target.getName())); target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", target.getName()));
playerProfile.setRecentlyHurt(System.currentTimeMillis()); mcMMOPlayer.getProfile().setRecentlyHurt(System.currentTimeMillis());
return true; return true;
} }
} }