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

Fixes

Browse Source
This commit is contained in:
sigonasr2 2016-08-13 22:12:23 -05:00
parent bdaf76186f
commit a41de55117
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

10
src/sig/plugin/TwosideKeeper/EliteMonster.java
View File

@ -118,10 +118,12 @@ public class EliteMonster {
} }
m.teleport(myspawn); m.teleport(myspawn);
m.setHealth(m.getMaxHealth()); m.setHealth(m.getMaxHealth());
Bukkit.getServer().broadcastMessage(m.getCustomName()+" Takedown Failed..."); if (dpslist.size()>0) {
Bukkit.getServer().broadcastMessage(ChatColor.YELLOW+"DPS Breakdown:"); Bukkit.getServer().broadcastMessage(m.getCustomName()+" Takedown Failed...");
Bukkit.getServer().broadcastMessage(generateDPSReport()); Bukkit.getServer().broadcastMessage(ChatColor.YELLOW+"DPS Breakdown:");
aPlugin.API.discordSendRaw(m.getCustomName()+" Takedown Failed...\n\n"+ChatColor.YELLOW+"DPS Breakdown:"+"\n```\n"+generateDPSReport()+"\n```"); Bukkit.getServer().broadcastMessage(generateDPSReport());
aPlugin.API.discordSendRaw(m.getCustomName()+" Takedown Failed...\n\n"+ChatColor.YELLOW+"DPS Breakdown:"+"\n```\n"+generateDPSReport()+"\n```");
}
dpslist.clear(); dpslist.clear();
} }
} }

8
src/sig/plugin/TwosideKeeper/PartyManager.java
View File

@ -47,9 +47,9 @@ public class PartyManager {
private static void UpdateScoreboard(int party, List<Player> partymembers, List<Player> oldmembers) { private static void UpdateScoreboard(int party, List<Player> partymembers, List<Player> oldmembers) {
String color = ConvertColor(party); String color = ConvertColor(party);
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "scoreboard objectives remove Party"+color); //Make sure the party is cleared out if it was used for something before... Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "scoreboard objectives remove Party"+party); //Make sure the party is cleared out if it was used for something before...
//Bukkit.getScoreboardManager().getMainScoreboard().registerNewObjective("Party"+color, "dummy"); //Bukkit.getScoreboardManager().getMainScoreboard().registerNewObjective("Party"+color, "dummy");
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "scoreboard objectives add Party"+color+" dummy Party"); Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "scoreboard objectives add Party"+party+" dummy Party");
//Bukkit.getScoreboardManager().getMainScoreboard().getObjective("Party"+color).setDisplaySlot(DisplaySlot.SIDEBAR); //Bukkit.getScoreboardManager().getMainScoreboard().getObjective("Party"+color).setDisplaySlot(DisplaySlot.SIDEBAR);
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "scoreboard objectives setdisplay sidebar.team."+color+" Party"+color); Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "scoreboard objectives setdisplay sidebar.team."+color+" Party"+color);
@ -59,7 +59,7 @@ public class PartyManager {
pd.partybonus = (partymembers.size()>=2)?partymembers.size()-1:0; pd.partybonus = (partymembers.size()>=2)?partymembers.size()-1:0;
TwosideKeeper.log("Party bonus is "+pd.partybonus, 2); TwosideKeeper.log("Party bonus is "+pd.partybonus, 2);
TwosideKeeper.log("Adding Player "+p.getName()+" to Scoreboard..", 5); TwosideKeeper.log("Adding Player "+p.getName()+" to Scoreboard..", 5);
Bukkit.dispatchCommand(Bukkit.getServer().getConsoleSender(), "scoreboard players set "+p.getName().toLowerCase()+" Party"+color+" "+((i+1)*-1)); Bukkit.dispatchCommand(Bukkit.getServer().getConsoleSender(), "scoreboard players set "+p.getName().toLowerCase()+" Party"+party+" "+((i+1)*-1));
Bukkit.dispatchCommand(Bukkit.getServer().getConsoleSender(), "scoreboard teams option "+p.getName().toLowerCase()+" color "+color); Bukkit.dispatchCommand(Bukkit.getServer().getConsoleSender(), "scoreboard teams option "+p.getName().toLowerCase()+" color "+color);
p.getScoreboard().getTeam(p.getName().toLowerCase()).setAllowFriendlyFire(false); p.getScoreboard().getTeam(p.getName().toLowerCase()).setAllowFriendlyFire(false);
p.getScoreboard().getTeam(p.getName().toLowerCase()).setSuffix(TwosideKeeper.createHealthbar(((p.getHealth())/p.getMaxHealth())*100,p)); p.getScoreboard().getTeam(p.getName().toLowerCase()).setSuffix(TwosideKeeper.createHealthbar(((p.getHealth())/p.getMaxHealth())*100,p));
@ -95,7 +95,7 @@ public class PartyManager {
} }
if (!lastorder.get(party).equals(sortedorder)) { if (!lastorder.get(party).equals(sortedorder)) {
for (int i=0;i<sortedorder.size();i++) { for (int i=0;i<sortedorder.size();i++) {
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "scoreboard players set "+sortedorder.get(i).getName().toLowerCase()+" Party"+color+" "+((i+1)*-1)); Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "scoreboard players set "+sortedorder.get(i).getName().toLowerCase()+" Party"+party+" "+((i+1)*-1));
} }
lastorder.put(party,sortedorder); lastorder.put(party,sortedorder);
} }