sigonasr2
/
SigMinecraft
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes to '/jobs members' before official release.

Browse Source
master_event
sigonasr2 11 years ago
parent 9fdb87addb
commit 0b98c8c74b
2 changed files with 57 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 53
      BankEconomyMod/src/me/kaZep/Base/Main.java
  2. 28
      BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java

53
BankEconomyMod/src/me/kaZep/Base/Main.java
Unescape View File

@ -3650,11 +3650,13 @@ public void payDay(int time)
} }
public String[] getJobs(String p) { public String[] getJobs(String p) {
p=p.toLowerCase();
String[] string= {getAccountsConfig().getString(p+".jobs.job1"),getAccountsConfig().getString(p+".jobs.job2"),getAccountsConfig().getString(p+".jobs.job3")}; String[] string= {getAccountsConfig().getString(p+".jobs.job1"),getAccountsConfig().getString(p+".jobs.job2"),getAccountsConfig().getString(p+".jobs.job3")};
return string; return string;
} }
public boolean PlayerinJob(String p,String job) { public boolean PlayerinJob(String p,String job) {
p=p.toLowerCase();
String[] jobs = getJobs(p); String[] jobs = getJobs(p);
for (int i=0;i<jobs.length;i++) { for (int i=0;i<jobs.length;i++) {
if (job.equalsIgnoreCase(jobs[i])) { if (job.equalsIgnoreCase(jobs[i])) {
@ -4099,6 +4101,7 @@ public void payDay(int time)
} }
public int getJobLv(String job, String p) { public int getJobLv(String job, String p) {
p=p.toLowerCase();
if (PlayerinJob(p,job)) { if (PlayerinJob(p,job)) {
int slot=-1; int slot=-1;
//Check which slot contains our job. //Check which slot contains our job.
@ -4542,10 +4545,18 @@ public void payDay(int time)
String[] jobs = getJobs(p); String[] jobs = getJobs(p);
//We can remove them from this job. //We can remove them from this job.
if (job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1"))) { if (job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1"))) {
//Remove from job members list. String[] s = getConfig().getString("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1")+"_members").split(", ");
getConfig().set("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1"))+"_members", getConfig().getString("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1"))+"_members").replace(", "+p.getName().toLowerCase(), "")); String s2 = "";
/*Try again in case it's the only entry.*/ for (int i=0;i<s.length;i++) {
getConfig().set("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1"))+"_members", getConfig().getString("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1"))+"_members").replace(p.getName().toLowerCase(), "")); if (!s[i].equalsIgnoreCase(p.getName().toLowerCase())) {
if (s2.equals("")) {
s2 = s[i];
} else {
s2 += ", "+s[i];
}
}
}
getConfig().set("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1")+"_members", s2);
//Remove 1 from main config. //Remove 1 from main config.
getConfig().set("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1"), Integer.valueOf(getConfig().getInt("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1"))-1)); getConfig().set("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1"), Integer.valueOf(getConfig().getInt("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job1"))-1));
saveConfig(); saveConfig();
@ -4558,11 +4569,18 @@ public void payDay(int time)
return true; return true;
} else } else
if (job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2"))) { if (job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2"))) {
//Remove from job members list. String[] s = getConfig().getString("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2")+"_members").split(", ");
getConfig().set("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2"))+"_members", getConfig().getString("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2"))+"_members").replace(", "+p.getName().toLowerCase(), "")); String s2 = "";
/*Try again in case it's the only entry.*/ for (int i=0;i<s.length;i++) {
getConfig().set("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2"))+"_members", getConfig().getString("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2"))+"_members").replace(p.getName().toLowerCase(), "")); if (!s[i].equalsIgnoreCase(p.getName().toLowerCase())) {
//Remove 1 from main config. if (s2.equals("")) {
s2 = s[i];
} else {
s2 += ", "+s[i];
}
}
}
getConfig().set("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2")+"_members", s2);
getConfig().set("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2"), Integer.valueOf(getConfig().getInt("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2"))-1)); getConfig().set("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2"), Integer.valueOf(getConfig().getInt("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job2"))-1));
saveConfig(); saveConfig();
//Remove from job 2. //Remove from job 2.
@ -4574,11 +4592,18 @@ public void payDay(int time)
return true; return true;
} else } else
if (job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3"))) { if (job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3"))) {
//Remove from job members list. String[] s = getConfig().getString("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3")+"_members").split(", ");
getConfig().set("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3"))+"_members", getConfig().getString("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3"))+"_members").replace(", "+p.getName().toLowerCase(), "")); String s2 = "";
/*Try again in case it's the only entry.*/ for (int i=0;i<s.length;i++) {
getConfig().set("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3"))+"_members", getConfig().getString("jobs."+job.equalsIgnoreCase(getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3"))+"_members").replace(p.getName().toLowerCase(), "")); if (!s[i].equalsIgnoreCase(p.getName().toLowerCase())) {
//Remove 1 from main config. if (s2.equals("")) {
s2 = s[i];
} else {
s2 += ", "+s[i];
}
}
}
getConfig().set("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3")+"_members", s2);
getConfig().set("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3"), Integer.valueOf(getConfig().getInt("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3"))-1)); getConfig().set("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3"), Integer.valueOf(getConfig().getInt("jobs."+getAccountsConfig().getString(p.getName().toLowerCase()+".jobs.job3"))-1));
saveConfig(); saveConfig();
//Remove from job 3. //Remove from job 3.

28
BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java
Unescape View File

@ -1743,19 +1743,27 @@ public String convertToItemName(String val) {
int lowest_slot = -1; int lowest_slot = -1;
while (sorted_players.size()>0) { while (sorted_players.size()>0) {
for (int i=0;i<sorted_players.size();i++) { for (int i=0;i<sorted_players.size();i++) {
if (sorted_players.get(i).toCharArray()[0]<lowest) { if (sorted_players.get(i).length()>0) { //If it's 0, for some reason it didn't read this name right....Skip it.
lowest=sorted_players.get(i).toCharArray()[0]; if (sorted_players.get(i).toCharArray()[0]<lowest) {
lowest_slot=i; lowest=sorted_players.get(i).toCharArray()[0];
lowest_slot=i;
}
} }
} }
sorted_list_players.add(sorted_players.get(lowest_slot)); if (lowest_slot!=-1) {
sorted_players.remove(lowest_slot); sorted_list_players.add(sorted_players.get(lowest_slot));
lowest_slot=-1; sorted_players.remove(lowest_slot);
lowest='z'+1; lowest_slot=-1;
lowest='z'+1;
}
} }
for (int i=0;i<sorted_list_players.size();i++) { if (sorted_list_players.size()>0) {
OfflinePlayer q = Bukkit.getOfflinePlayer(sorted_list_players.get(i)); for (int i=0;i<sorted_list_players.size();i++) {
p.sendMessage(" "+q.getName()+ChatColor.GRAY+ChatColor.ITALIC+" (Lv"+this.plugin.getJobLv(job, q.getName())+")"); OfflinePlayer q = Bukkit.getOfflinePlayer(sorted_list_players.get(i));
p.sendMessage(" "+q.getName()+ChatColor.GRAY+ChatColor.ITALIC+" (Lv"+this.plugin.getJobLv(job, q.getName().toLowerCase())+")");
}
} else {
p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"- No one in this job yet. -");
} }
} else { } else {
p.sendMessage(ChatColor.GOLD+"Sorry, something bad happened! Please report this to an administrator."); p.sendMessage(ChatColor.GOLD+"Sorry, something bad happened! Please report this to an administrator.");

Write Preview
Loading…
Cancel
Save