Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 16:19:53 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TfT_02 2013-03-05 00:30:07 +01:00
parent 0c027ca697
commit 9cf322ca0b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;