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

We don't need that param.

Browse Source
This commit is contained in:
gmcferrin 2013-01-09 23:15:29 -05:00
parent 4a4db675f1
commit e036b7ac70
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
View File

@ -140,7 +140,7 @@ public class PartyCommand implements CommandExecutor {
Party newParty = partyManagerInstance.getParty(args[0]); Party newParty = partyManagerInstance.getParty(args[0]);
// Check to see if the party exists, and if it does, can the player join it? // Check to see if the party exists, and if it does, can the player join it?
if (newParty != null && !partyManagerInstance.checkJoinability(player, playerProfile, newParty, null)) { if (newParty != null && !partyManagerInstance.checkJoinability(player, newParty, null)) {
return true; // End before any event is fired. return true; // End before any event is fired.
} }
@ -216,7 +216,7 @@ public class PartyCommand implements CommandExecutor {
Party newParty = partyManagerInstance.getParty(args[0]); Party newParty = partyManagerInstance.getParty(args[0]);
// Check to see if the party exists, and if it does, can the player join it? // Check to see if the party exists, and if it does, can the player join it?
if (newParty != null && !partyManagerInstance.checkJoinability(player, playerProfile, newParty, args[1])) { if (newParty != null && !partyManagerInstance.checkJoinability(player, newParty, args[1])) {
return true; // End before any event is fired. return true; // End before any event is fired.
} }
@ -235,7 +235,7 @@ public class PartyCommand implements CommandExecutor {
Party newParty = partyManagerInstance.getParty(args[0]); Party newParty = partyManagerInstance.getParty(args[0]);
// Check to see if the party exists, and if it does, can the player join it? // Check to see if the party exists, and if it does, can the player join it?
if (newParty != null && !partyManagerInstance.checkJoinability(player, playerProfile, newParty, args[1])) { if (newParty != null && !partyManagerInstance.checkJoinability(player, newParty, args[1])) {
return true; // End before any event is fired. return true; // End before any event is fired.
} }

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

@ -224,7 +224,7 @@ public class PartyManager {
parties.add(party); parties.add(party);
} }
else if (!checkJoinability(player, playerProfile, party, password)) { else if (!checkJoinability(player, party, password)) {
return; return;
} }
@ -241,7 +241,7 @@ public class PartyManager {
* @param password The password provided by the player * @param password The password provided by the player
* @return true if the player can join the party * @return true if the player can join the party
*/ */
public boolean checkJoinability(Player player, PlayerProfile playerProfile, Party party, String password) { public boolean checkJoinability(Player player, Party party, String password) {
//Don't care about passwords if it isn't locked //Don't care about passwords if it isn't locked
if (party.isLocked()) { if (party.isLocked()) {
String partyPassword = party.getPassword(); String partyPassword = party.getPassword();