From 51493fab487a772452807c664d808e17e4399e66 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Tue, 12 Feb 2013 11:44:29 -0500
Subject: [PATCH] Don't pass the plugin.

---
 src/main/java/com/gmail/nossr50/mcMMO.java            |  2 +-
 .../com/gmail/nossr50/party/commands/PtpCommand.java  | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 35953deda..3ba052fa5 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -290,7 +290,7 @@ public class mcMMO extends JavaPlugin {
         CommandRegistrationHelper.registerAdminChatCommand();
         CommandRegistrationHelper.registerPartyCommand();
         CommandRegistrationHelper.registerPartyChatCommand();
-        getCommand("ptp").setExecutor(new PtpCommand(this));
+        getCommand("ptp").setExecutor(new PtpCommand());
 
         // Other commands
         CommandRegistrationHelper.registerAddxpCommand();
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 990dbdc9e..f9622875d 100644
--- a/src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java
@@ -18,14 +18,9 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
 public class PtpCommand implements CommandExecutor {
-    private final mcMMO plugin;
     private Player player;
     private McMMOPlayer mcMMOPlayer;
 
-    public PtpCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         String usage = LocaleLoader.getString("Commands.Usage.1", "ptp", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">");
@@ -71,7 +66,7 @@ public class PtpCommand implements CommandExecutor {
     }
 
     private boolean sendTeleportRequest(String args) {
-        Player target = plugin.getServer().getPlayer(args);
+        Player target = mcMMO.p.getServer().getPlayer(args);
 
         if (player.equals(target)) {
             player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
@@ -98,7 +93,7 @@ public class PtpCommand implements CommandExecutor {
 
             if (!targetMcMMOPlayer.getPtpConfirmRequired()) {
                 McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, mcMMOPlayer.getParty().getName());
-                plugin.getServer().getPluginManager().callEvent(event);
+                mcMMO.p.getServer().getPluginManager().callEvent(event);
 
                 if (event.isCancelled()) {
                     return true;
@@ -168,7 +163,7 @@ public class PtpCommand implements CommandExecutor {
         }
 
         McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(target, player, mcMMOPlayer.getParty().getName());
-        plugin.getServer().getPluginManager().callEvent(event);
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
 
         if (event.isCancelled()) {
             return true;