Browse Source

Fixed NPE with /ptp <accept|toggle|acceptall>

TfT_02 12 years ago
parent
commit
9cf322ca0b
1 changed files with 3 additions and 1 deletions
  1. 3 1
      src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java

+ 3 - 1
src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java

@@ -32,6 +32,9 @@ public class PtpCommand implements CommandExecutor {
 
 
         switch (args.length) {
         switch (args.length) {
             case 1:
             case 1:
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+
                 if (args[0].equalsIgnoreCase("toggle")) {
                 if (args[0].equalsIgnoreCase("toggle")) {
                     if (!Permissions.partyTeleportToggle(sender)) {
                     if (!Permissions.partyTeleportToggle(sender)) {
                         sender.sendMessage(command.getPermissionMessage());
                         sender.sendMessage(command.getPermissionMessage());
@@ -50,7 +53,6 @@ public class PtpCommand implements CommandExecutor {
                     return acceptAnyTeleportRequest();
                     return acceptAnyTeleportRequest();
                 }
                 }
 
 
-                player = (Player) sender;
                 int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
                 int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
                 long recentlyHurt = UserManager.getPlayer(player).getRecentlyHurt() * Misc.TIME_CONVERSION_FACTOR;
                 long recentlyHurt = UserManager.getPlayer(player).getRecentlyHurt() * Misc.TIME_CONVERSION_FACTOR;