ChromaGaming/Chroma-Chat
1
0
Fork 0
Code Issues 15 Pull requests 1 Packages Projects Releases 8 Wiki Activity

Fixed NPE

Browse source
This commit is contained in:
Norbi Peti 2017-04-15 20:15:15 +02:00
parent 5da1083067
commit 7751defc9f
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/buttondevteam/chat/ChatPlayer.java
View file

@ -75,8 +75,7 @@ public class ChatPlayer extends TBMCPlayerBase {
return String.format(noformats ? "(non-presser)" : "§7(--s)§r"); return String.format(noformats ? "(non-presser)" : "§7(--s)§r");
if (time == FlairTimeNone) if (time == FlairTimeNone)
return ""; return "";
return noformats ? String.format("(%ss)", FlairTime().get()) return noformats ? String.format("(%ds)", time) : String.format("§%x(%ds)§r", GetFlairColor(), time);
: String.format("§%x(%ss)§r", GetFlairColor(), FlairTime().get());
} }
/** /**
@ -109,23 +108,24 @@ public class ChatPlayer extends TBMCPlayerBase {
} }
public short GetFlairColor() { public short GetFlairColor() {
if (FlairCheater().get()) if (FlairCheater().getOrDefault(false))
return 0x5; return 0x5;
if (FlairTime().get() == -1) final int flairTime = FlairTime().getOrDefault(FlairTimeNone);
if (flairTime == FlairTimeNonPresser)
return 0x7; return 0x7;
else if (FlairTime().get() == -2) else if (flairTime == FlairTimeCantPress)
return 0xf; return 0xf;
else if (FlairTime().get() <= 60 && FlairTime().get() >= 52) else if (flairTime <= 60 && flairTime >= 52)
return 0x5; return 0x5;
else if (FlairTime().get() <= 51 && FlairTime().get() >= 42) else if (flairTime <= 51 && flairTime >= 42)
return 0x9; return 0x9;
else if (FlairTime().get() <= 41 && FlairTime().get() >= 32) else if (flairTime <= 41 && flairTime >= 32)
return 0xa; return 0xa;
else if (FlairTime().get() <= 31 && FlairTime().get() >= 22) else if (flairTime <= 31 && flairTime >= 22)
return 0xe; return 0xe;
else if (FlairTime().get() <= 21 && FlairTime().get() >= 11) else if (flairTime <= 21 && flairTime >= 11)
return 0x6; return 0x6;
else if (FlairTime().get() <= 11 && FlairTime().get() >= 0) else if (flairTime <= 11 && flairTime >= 0)
return 0xc; return 0xc;
return 0xf; return 0xf;
} }

4
src/main/java/buttondevteam/chat/listener/PlayerListener.java
View file

@ -221,8 +221,8 @@ public class PlayerListener implements Listener {
public void run() { public void run() {
if (ActiveF) { if (ActiveF) {
ActiveF = false; ActiveF = false;
if (FPlayer != null && FPlayer.FCount().get() < Integer.MAX_VALUE - 1) if (FPlayer != null && FPlayer.FCount().getOrDefault(0) < Integer.MAX_VALUE - 1)
FPlayer.FCount().set(FPlayer.FCount().get() + Fs.size()); FPlayer.FCount().set(FPlayer.FCount().getOrDefault(0) + Fs.size());
Bukkit.broadcastMessage("§b" + Fs.size() + " " + (Fs.size() == 1 ? "person" : "people") Bukkit.broadcastMessage("§b" + Fs.size() + " " + (Fs.size() == 1 ? "person" : "people")
+ " paid their respects.§r"); + " paid their respects.§r");
Fs.clear(); Fs.clear();