Not just for XP sharing.

This commit is contained in:
GJ 2013-02-08 11:53:49 -05:00
parent 787c4e5b73
commit 794071efb8
4 changed files with 11 additions and 11 deletions

View File

@ -13,7 +13,7 @@ public class Party {
private String name; private String name;
private String password; private String password;
private boolean locked; private boolean locked;
private ShareHandler.XpShareMode xpShareMode; private ShareHandler.ShareMode xpShareMode;
public List<String> getMembers() { public List<String> getMembers() {
return members; return members;
@ -64,11 +64,11 @@ public class Party {
this.locked = locked; this.locked = locked;
} }
public void setXpShareMode(ShareHandler.XpShareMode xpShareMode) { public void setXpShareMode(ShareHandler.ShareMode xpShareMode) {
this.xpShareMode = xpShareMode; this.xpShareMode = xpShareMode;
} }
public ShareHandler.XpShareMode getXpShareMode() { public ShareHandler.ShareMode getXpShareMode() {
return xpShareMode; return xpShareMode;
} }
} }

View File

@ -262,7 +262,7 @@ public final class PartyManager {
party.setName(partyName); party.setName(partyName);
party.setLeader(playerName); party.setLeader(playerName);
party.setXpShareMode(ShareHandler.XpShareMode.NONE); party.setXpShareMode(ShareHandler.ShareMode.NONE);
party.setLocked(true);//Parties are now invite-only by default, can be set to open with /party unlock party.setLocked(true);//Parties are now invite-only by default, can be set to open with /party unlock
if (password != null) { if (password != null) {
@ -476,7 +476,7 @@ public final class PartyManager {
party.setLeader(partiesFile.getString(partyName + ".Leader")); party.setLeader(partiesFile.getString(partyName + ".Leader"));
party.setPassword(partiesFile.getString(partyName + ".Password")); party.setPassword(partiesFile.getString(partyName + ".Password"));
party.setLocked(partiesFile.getBoolean(partyName + ".Locked")); party.setLocked(partiesFile.getBoolean(partyName + ".Locked"));
party.setXpShareMode(ShareHandler.XpShareMode.getFromString(partiesFile.getString(partyName + ".ExpShareMode"))); party.setXpShareMode(ShareHandler.ShareMode.getFromString(partiesFile.getString(partyName + ".ExpShareMode")));
party.getMembers().addAll(partiesFile.getStringList(partyName + ".Members")); party.getMembers().addAll(partiesFile.getStringList(partyName + ".Members"));
parties.add(party); parties.add(party);

View File

@ -10,11 +10,11 @@ import com.gmail.nossr50.skills.utilities.SkillType;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public final class ShareHandler { public final class ShareHandler {
public enum XpShareMode { public enum ShareMode {
NONE, NONE,
EQUAL; EQUAL;
public static XpShareMode getFromString(String string) { public static ShareMode getFromString(String string) {
try { try {
return valueOf(string); return valueOf(string);
} }

View File

@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.party.ShareHandler; import com.gmail.nossr50.party.ShareHandler;
import com.gmail.nossr50.party.ShareHandler.XpShareMode; import com.gmail.nossr50.party.ShareHandler.ShareMode;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
@ -35,10 +35,10 @@ public class PartyExpShareCommand implements CommandExecutor {
} }
if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) { if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
handleChangingShareMode(XpShareMode.NONE); handleChangingShareMode(ShareMode.NONE);
} }
else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")) { else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")) {
handleChangingShareMode(XpShareMode.EQUAL); handleChangingShareMode(ShareMode.EQUAL);
} }
else { else {
sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "[NONE | EQUAL]")); sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "[NONE | EQUAL]"));
@ -52,7 +52,7 @@ public class PartyExpShareCommand implements CommandExecutor {
} }
} }
private void handleChangingShareMode(ShareHandler.XpShareMode mode) { private void handleChangingShareMode(ShareHandler.ShareMode mode) {
playerParty.setXpShareMode(mode); playerParty.setXpShareMode(mode);
for (Player member : playerParty.getOnlineMembers()) { for (Player member : playerParty.getOnlineMembers()) {