From 25a54ea80267908841a0548fdae05dfab7547528 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Wed, 13 Feb 2013 19:29:46 -0500
Subject: [PATCH] Clean up /ptp a bit more.

---
 .../nossr50/party/commands/PtpCommand.java      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java b/src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java
index 9b972d310..c4083b940 100644
--- a/src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java
@@ -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());