EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 23:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix for NPE on party checks due to CombatTag plugin.

Browse Source
This commit is contained in:
GJ 2012-06-27 23:50:59 -04:00
parent 533955a9c7
commit 32e9de6e9a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/gmail/nossr50/party/PartyManager.java
View File

@ -41,8 +41,18 @@ public class PartyManager {
* @return true if they are in the same party, false otherwise * @return true if they are in the same party, false otherwise
*/ */
public boolean inSameParty(Player firstPlayer, Player secondPlayer) { public boolean inSameParty(Player firstPlayer, Player secondPlayer) {
if (Users.getProfile(firstPlayer).getParty() == null || Users.getProfile(secondPlayer).getParty() == null if (Users.getProfile(firstPlayer) == null) {
|| !Users.getProfile(firstPlayer).getParty().equals(Users.getProfile(secondPlayer).getParty())) { plugin.getLogger().info("The defending player's profile was null.");
plugin.getLogger().info("This player is online: " + firstPlayer.isOnline());
return false;
}
if (Users.getProfile(secondPlayer) == null) {
plugin.getLogger().info("The attacking player's profile was null.");
plugin.getLogger().info("This player is online: " + secondPlayer.isOnline());
return false;
}
if (Users.getProfile(firstPlayer).getParty() == null || Users.getProfile(secondPlayer).getParty() == null || !Users.getProfile(firstPlayer).getParty().equals(Users.getProfile(secondPlayer).getParty())) {
return false; return false;
} }