From 0ba4bc25c783889ff0a67c6cab7c91d3ddb20a2e Mon Sep 17 00:00:00 2001 From: GJ Date: Tue, 28 May 2013 13:33:20 -0400 Subject: [PATCH] Use player objects instead of names - should be more efficient and less buggy. --- .../java/com/gmail/nossr50/commands/KrakenCommand.java | 3 ++- .../java/com/gmail/nossr50/commands/McnotifyCommand.java | 3 ++- .../java/com/gmail/nossr50/commands/MobhealthCommand.java | 3 ++- .../java/com/gmail/nossr50/commands/ToggleCommand.java | 4 ++-- .../java/com/gmail/nossr50/commands/chat/ChatCommand.java | 7 ++++--- .../nossr50/commands/experience/ExperienceCommand.java | 4 ++-- .../nossr50/commands/experience/SkillresetCommand.java | 5 +++-- .../gmail/nossr50/commands/party/PartyAcceptCommand.java | 4 ++-- .../nossr50/commands/party/PartyChangeOwnerCommand.java | 3 ++- .../nossr50/commands/party/PartyChangePasswordCommand.java | 3 ++- .../com/gmail/nossr50/commands/party/PartyCommand.java | 4 ++-- .../gmail/nossr50/commands/party/PartyCreateCommand.java | 4 ++-- .../gmail/nossr50/commands/party/PartyDisbandCommand.java | 2 +- .../gmail/nossr50/commands/party/PartyExpShareCommand.java | 2 +- .../com/gmail/nossr50/commands/party/PartyInfoCommand.java | 4 ++-- .../gmail/nossr50/commands/party/PartyInviteCommand.java | 4 ++-- .../nossr50/commands/party/PartyItemShareCommand.java | 4 ++-- .../com/gmail/nossr50/commands/party/PartyJoinCommand.java | 4 ++-- .../com/gmail/nossr50/commands/party/PartyKickCommand.java | 2 +- .../com/gmail/nossr50/commands/party/PartyLockCommand.java | 3 ++- .../gmail/nossr50/commands/party/PartyRenameCommand.java | 2 +- .../commands/party/teleport/PtpAcceptAnyCommand.java | 4 ++-- .../nossr50/commands/party/teleport/PtpAcceptCommand.java | 4 ++-- .../gmail/nossr50/commands/party/teleport/PtpCommand.java | 4 ++-- .../nossr50/commands/party/teleport/PtpToggleCommand.java | 4 ++-- .../com/gmail/nossr50/commands/player/McstatsCommand.java | 4 ++-- .../com/gmail/nossr50/commands/skills/SkillCommand.java | 4 ++-- .../com/gmail/nossr50/commands/spout/SpoutCommand.java | 3 ++- .../java/com/gmail/nossr50/util/player/UserManager.java | 2 ++ 29 files changed, 57 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java b/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java index 99028c66c..ddcd00e6a 100644 --- a/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java @@ -7,6 +7,7 @@ import java.util.Set; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; +import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; import com.gmail.nossr50.datatypes.player.McMMOPlayer; @@ -29,7 +30,7 @@ public class KrakenCommand implements TabExecutor { return true; } - UserManager.getPlayer(sender.getName()).getFishingManager().unleashTheKraken(); + UserManager.getPlayer((Player) sender).getFishingManager().unleashTheKraken(); return true; case 1: diff --git a/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java b/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java index e930e63b7..41ea4c939 100644 --- a/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java @@ -5,6 +5,7 @@ import java.util.List; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; +import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.locale.LocaleLoader; @@ -17,7 +18,7 @@ public class McnotifyCommand implements TabExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { switch (args.length) { case 0: - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); + McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender); sender.sendMessage(LocaleLoader.getString("Commands.Notifications." + (mcMMOPlayer.useChatNotifications() ? "Off" : "On"))); mcMMOPlayer.toggleChatNotifications(); diff --git a/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java b/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java index 08eb6daa2..d0f57aa86 100644 --- a/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java @@ -7,6 +7,7 @@ import java.util.List; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; +import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; import com.gmail.nossr50.datatypes.MobHealthbarType; @@ -38,7 +39,7 @@ public class MobhealthCommand implements TabExecutor { switch (args.length) { case 1: - PlayerProfile playerProfile = UserManager.getPlayer(sender.getName()).getProfile(); + PlayerProfile playerProfile = UserManager.getPlayer((Player) sender).getProfile(); try { MobHealthbarType type = MobHealthbarType.valueOf(args[0].toUpperCase().trim()); diff --git a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java index 885807638..70ce51884 100644 --- a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java @@ -33,8 +33,8 @@ public abstract class ToggleCommand implements TabExecutor { return true; } - mcMMOPlayer = UserManager.getPlayer(sender.getName()); - player = mcMMOPlayer.getPlayer(); + player = (Player) sender; + mcMMOPlayer = UserManager.getPlayer(player); applyCommandAction(); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java index 09641aa4c..64e9bec9a 100644 --- a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java @@ -6,6 +6,7 @@ import java.util.List; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; +import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; import com.gmail.nossr50.chat.ChatMode; @@ -32,7 +33,7 @@ public abstract class ChatCommand implements TabExecutor { return true; } - mcMMOPlayer = UserManager.getPlayer(sender.getName()); + mcMMOPlayer = UserManager.getPlayer((Player) sender); if (chatMode.isEnabled(mcMMOPlayer)) { disableChatMode(sender); @@ -49,7 +50,7 @@ public abstract class ChatCommand implements TabExecutor { return true; } - mcMMOPlayer = UserManager.getPlayer(sender.getName()); + mcMMOPlayer = UserManager.getPlayer((Player) sender); enableChatMode(sender); return true; @@ -60,7 +61,7 @@ public abstract class ChatCommand implements TabExecutor { return true; } - mcMMOPlayer = UserManager.getPlayer(sender.getName()); + mcMMOPlayer = UserManager.getPlayer((Player) sender); disableChatMode(sender); return true; diff --git a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java index d5d8626f1..e7de5a510 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java @@ -46,8 +46,8 @@ public abstract class ExperienceCommand implements TabExecutor { return true; } - mcMMOPlayer = UserManager.getPlayer(sender.getName()); - player = mcMMOPlayer.getPlayer(); + player = (Player) sender; + mcMMOPlayer = UserManager.getPlayer(player); profile = mcMMOPlayer.getProfile(); editValues(); diff --git a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java index a4414b930..4fb74e656 100644 --- a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java @@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.experience; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.player.PlayerProfile; @@ -39,8 +40,8 @@ public class SkillresetCommand extends ExperienceCommand { return true; } - mcMMOPlayer = UserManager.getPlayer(sender.getName()); - player = mcMMOPlayer.getPlayer(); + player = (Player) sender; + mcMMOPlayer = UserManager.getPlayer(player); profile = mcMMOPlayer.getProfile(); editValues(); diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java index a56347230..28e517f82 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java @@ -15,8 +15,8 @@ public class PartyAcceptCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { switch (args.length) { case 1: - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); - Player player = mcMMOPlayer.getPlayer(); + Player player = (Player) sender; + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); if (!mcMMOPlayer.hasPartyInvite()) { sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites")); diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java index d11dd5a93..cb314515a 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java @@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.party; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.locale.LocaleLoader; @@ -14,7 +15,7 @@ public class PartyChangeOwnerCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { switch (args.length) { case 2: - Party playerParty = UserManager.getPlayer(sender.getName()).getParty(); + Party playerParty = UserManager.getPlayer((Player) sender).getParty(); if (!playerParty.getMembers().contains(args[1])) { sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1])); diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java index 5dad435d0..20051e7c4 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java @@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.party; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.locale.LocaleLoader; @@ -13,7 +14,7 @@ public class PartyChangePasswordCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - playerParty = UserManager.getPlayer(sender.getName()).getParty(); + playerParty = UserManager.getPlayer((Player) sender).getParty(); switch (args.length) { case 1: diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java index 6b9eacfd0..8bc879edc 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java @@ -70,8 +70,8 @@ public class PartyCommand implements TabExecutor { return true; } - mcMMOPlayer = UserManager.getPlayer(sender.getName()); - player = mcMMOPlayer.getPlayer(); + player = (Player) sender; + mcMMOPlayer = UserManager.getPlayer(player); if (args.length < 1) { if (!mcMMOPlayer.inParty()) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java index a44945c9d..9f02b4b55 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java @@ -19,8 +19,8 @@ public class PartyCreateCommand implements CommandExecutor { case 3: Party newParty = PartyManager.getParty(args[1]); - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); - Player player = mcMMOPlayer.getPlayer(); + Player player = (Player) sender; + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); // Check to see if the party exists, and if it does cancel creating a new party if (PartyManager.checkPartyExistence(player, newParty, args[1])) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java index c278117bf..277112cbe 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java @@ -16,7 +16,7 @@ public class PartyDisbandCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { switch (args.length) { case 1: - Party playerParty = UserManager.getPlayer(sender.getName()).getParty(); + Party playerParty = UserManager.getPlayer((Player) sender).getParty(); String partyName = playerParty.getName(); for (Player member : playerParty.getOnlineMembers()) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyExpShareCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyExpShareCommand.java index bfaf26e7c..9cbbaede9 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyExpShareCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyExpShareCommand.java @@ -26,7 +26,7 @@ public class PartyExpShareCommand implements CommandExecutor { switch (args.length) { case 2: - playerParty = UserManager.getPlayer(sender.getName()).getParty(); + playerParty = UserManager.getPlayer((Player) sender).getParty(); if (args[1].equalsIgnoreCase("none") || CommandUtils.shouldDisableToggle(args[1])) { handleChangingShareMode(ShareMode.NONE); diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java index 7a0483ed2..48e098a16 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java @@ -25,8 +25,8 @@ public class PartyInfoCommand implements CommandExecutor { switch (args.length) { case 0: case 1: - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); - player = mcMMOPlayer.getPlayer(); + player = (Player) sender; + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); playerParty = mcMMOPlayer.getParty(); displayPartyHeader(); diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java index 233d85e44..714d1beb2 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java @@ -24,8 +24,8 @@ public class PartyInviteCommand implements CommandExecutor { } Player target = mcMMOTarget.getPlayer(); - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); - Player player = mcMMOPlayer.getPlayer(); + Player player = (Player) sender; + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); if (player.equals(target)) { sender.sendMessage(LocaleLoader.getString("Party.Invite.Self")); diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java index 99b41eca0..b45b81d9d 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java @@ -26,7 +26,7 @@ public class PartyItemShareCommand implements CommandExecutor { switch (args.length) { case 2: - playerParty = UserManager.getPlayer(sender.getName()).getParty(); + playerParty = UserManager.getPlayer((Player) sender).getParty(); ShareMode mode = ShareMode.getShareMode(args[1].toUpperCase()); if (mode == null) { @@ -38,7 +38,7 @@ public class PartyItemShareCommand implements CommandExecutor { return true; case 3: - playerParty = UserManager.getPlayer(sender.getName()).getParty(); + playerParty = UserManager.getPlayer((Player) sender).getParty(); boolean toggle = false; if (CommandUtils.shouldEnableToggle(args[2])) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java index 1aef6d145..5c9c2c777 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java @@ -77,8 +77,8 @@ public class PartyJoinCommand implements CommandExecutor { return false; } - mcMMOPlayer = UserManager.getPlayer(sender.getName()); - player = mcMMOPlayer.getPlayer(); + player = (Player) sender; + mcMMOPlayer = UserManager.getPlayer(player); playerParty = mcMMOPlayer.getParty(); targetParty = mcMMOTarget.getParty(); diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java index f388afeb8..2968dfcd0 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java @@ -18,7 +18,7 @@ public class PartyKickCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { switch (args.length) { case 2: - Party playerParty = UserManager.getPlayer(sender.getName()).getParty(); + Party playerParty = UserManager.getPlayer((Player) sender).getParty(); OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]); if (!playerParty.getMembers().contains(target.getName())) { diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java index b25dd9f5a..bcdb1a4d2 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java @@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.party; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.locale.LocaleLoader; @@ -15,7 +16,7 @@ public class PartyLockCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - playerParty = UserManager.getPlayer(sender.getName()).getParty(); + playerParty = UserManager.getPlayer((Player) sender).getParty(); switch (args.length) { case 1: diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java index 85fc21764..ec389e760 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java @@ -17,7 +17,7 @@ public class PartyRenameCommand implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { switch (args.length) { case 2: - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); + McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender); Party playerParty = mcMMOPlayer.getParty(); String oldPartyName = playerParty.getName(); diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java index d12904388..8ef1ded52 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java @@ -18,8 +18,8 @@ public class PtpAcceptAnyCommand implements CommandExecutor { return true; } - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); - Player player = mcMMOPlayer.getPlayer(); + Player player = (Player) sender; + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); if (mcMMOPlayer.getPtpConfirmRequired()) { player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled")); diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java index f6784bbf8..cdcd87b92 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java @@ -21,8 +21,8 @@ public class PtpAcceptCommand implements CommandExecutor { return true; } - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); - Player player = mcMMOPlayer.getPlayer(); + Player player = (Player) sender; + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); if (!mcMMOPlayer.hasPtpRequest()) { player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests")); diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java index 207f22a53..73313fe20 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java @@ -51,8 +51,8 @@ public class PtpCommand implements TabExecutor { return ptpAcceptAnyCommand.onCommand(sender, command, label, args); } - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); - Player player = mcMMOPlayer.getPlayer(); + Player player = (Player) sender; + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); long recentlyHurt = mcMMOPlayer.getRecentlyHurt(); int hurtCooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown(); diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java index 81216225a..6e8d48083 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java @@ -18,8 +18,8 @@ public class PtpToggleCommand implements CommandExecutor { return true; } - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); - Player player = mcMMOPlayer.getPlayer(); + Player player = (Player) sender; + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); if (mcMMOPlayer.getPtpEnabled()) { player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled")); diff --git a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java b/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java index 8218e7aa3..1c4a8bb1e 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java @@ -24,8 +24,8 @@ public class McstatsCommand implements TabExecutor { switch (args.length) { case 0: - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName()); - Player player = mcMMOPlayer.getPlayer(); + Player player = (Player) sender; + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); if (Config.getInstance().getMcstatsScoreboardsEnabled()) { ScoreboardManager.setupPlayerScoreboard(player.getName()); diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java index 9c68bf3a1..f58aa640f 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java @@ -56,8 +56,8 @@ public abstract class SkillCommand implements TabExecutor { return true; } - mcMMOPlayer = UserManager.getPlayer(sender.getName()); - player = mcMMOPlayer.getPlayer(); + player = (Player) sender; + mcMMOPlayer = UserManager.getPlayer(player); switch (args.length) { case 0: diff --git a/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java index a06200065..f63af0fb4 100644 --- a/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java @@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.spout; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; +import org.bukkit.entity.Player; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.spout.SpoutConfig; @@ -27,7 +28,7 @@ public abstract class SpoutCommand implements TabExecutor { return true; } - playerProfile = UserManager.getPlayer(sender.getName()).getProfile(); + playerProfile = UserManager.getPlayer((Player) sender).getProfile(); spoutHud = playerProfile.getSpoutHud(); if (spoutHud == null) { diff --git a/src/main/java/com/gmail/nossr50/util/player/UserManager.java b/src/main/java/com/gmail/nossr50/util/player/UserManager.java index b1db369cc..b547dfa9d 100644 --- a/src/main/java/com/gmail/nossr50/util/player/UserManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/UserManager.java @@ -73,9 +73,11 @@ public final class UserManager { */ public static McMMOPlayer getPlayer(String playerName) { List matches = mcMMO.p.getServer().matchPlayer(playerName); + if (matches.size() == 1) { playerName = matches.get(0).getName(); } + return players.get(playerName); }