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

Back to the old way of doing things

Browse Source
This commit is contained in:
nossr50 2012-06-24 13:26:21 -07:00
parent 1a5bd1b6a2
commit 24eb34c182
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,14 +41,8 @@ public class PartyManager {
* @return true if they are in the same party, false otherwise
*/
public boolean inSameParty(Player firstPlayer, Player secondPlayer) {
//Since party can be null at times, we need to make sure that it isn't null here
if(Users.getProfile(firstPlayer).getParty() == null || Users.getProfile(secondPlayer).getParty() == null)
return false;
Party firstParty = Users.getProfile(firstPlayer).getParty();
Party secondParty = Users.getProfile(secondPlayer).getParty();
if (firstParty == null || secondParty == null || firstParty != secondParty) {
if (Users.getProfile(firstPlayer).getParty() == null || Users.getProfile(secondPlayer).getParty() == null
|| Users.getProfile(firstPlayer).getParty().equals(Users.getProfile(secondPlayer).getParty())) {
return false;
}