From e036b7ac703921e0dca3d47e3e90729b4de6fe21 Mon Sep 17 00:00:00 2001 From: gmcferrin Date: Wed, 9 Jan 2013 23:15:29 -0500 Subject: [PATCH] We don't need that param. --- .../java/com/gmail/nossr50/commands/party/PartyCommand.java | 6 +++--- src/main/java/com/gmail/nossr50/party/PartyManager.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 986881d97..9538fbc33 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java @@ -140,7 +140,7 @@ public class PartyCommand implements CommandExecutor { Party newParty = partyManagerInstance.getParty(args[0]); // 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. } @@ -216,7 +216,7 @@ public class PartyCommand implements CommandExecutor { Party newParty = partyManagerInstance.getParty(args[0]); // 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. } @@ -235,7 +235,7 @@ public class PartyCommand implements CommandExecutor { Party newParty = partyManagerInstance.getParty(args[0]); // 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. } diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java index 408c18f8a..c5a4beb43 100644 --- a/src/main/java/com/gmail/nossr50/party/PartyManager.java +++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java @@ -224,7 +224,7 @@ public class PartyManager { parties.add(party); } - else if (!checkJoinability(player, playerProfile, party, password)) { + else if (!checkJoinability(player, party, password)) { return; } @@ -241,7 +241,7 @@ public class PartyManager { * @param password The password provided by the player * @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 if (party.isLocked()) { String partyPassword = party.getPassword();