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

Remove unnecessary debug messages. Fixed random blank notifications

Browse Source 
appearing.
This commit is contained in:
sigonasr2 2017-11-28 00:15:59 -06:00
parent bd0efb9bb6
commit 13cd308813
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
sigIRCv2.jar
View File

Binary file not shown.

29
src/sig/modules/RabiRace/Profile.java
View File

@ -151,11 +151,17 @@ public class Profile {
announcement = "has obtained a Pack Up! ("+packUps+" total)"; announcement = "has obtained a Pack Up! ("+packUps+" total)";
} }
if (oldProfile.rainbowEggCount==rainbowEggCount-1) { if (oldProfile.rainbowEggCount==rainbowEggCount-1) {
if (5-rainbowEggCount==0) { if (RabiRaceModule.mySession!=null &&
announcement = "has obtained 5 Rainbow Eggs! (NAME) has completed the race!"; RabiRaceModule.mySession.gamemode==0 &&
} else if (5-rainbowEggCount>0) RabiRaceModule.mySession.eggCount>0) {
{ if (RabiRaceModule.mySession.eggCount-rainbowEggCount==0) {
announcement = "has obtained a Rainbow Egg! ("+Math.max(5-rainbowEggCount, 0)+" to go!)"; announcement = "has obtained "+RabiRaceModule.mySession.eggCount+" Rainbow Eggs! (NAME) has completed the race!";
} else if (RabiRaceModule.mySession.eggCount-rainbowEggCount>0)
{
announcement = "has obtained a Rainbow Egg! ("+Math.max(RabiRaceModule.mySession.eggCount-rainbowEggCount, 0)+" to go!)";
}
} else {
announcement = "has obtained a Rainbow Egg! ("+rainbowEggCount+" total)";
} }
} }
for (MemoryData md : key_items.keySet()) { for (MemoryData md : key_items.keySet()) {
@ -170,7 +176,7 @@ public class Profile {
announcement = "has obtained the "+md.name+" badge!"; announcement = "has obtained the "+md.name+" badge!";
} }
} }
if (changedValueCount!=0) { if (announcement.length()>0 && changedValueCount!=0) {
SendAnnouncement(announcement); SendAnnouncement(announcement);
} }
} }
@ -239,7 +245,7 @@ public class Profile {
int i=0; int i=0;
displayName = data[i++]; displayName = data[i++];
avatar = Avatar.getAvatarFromID(Integer.parseInt(data[i++])); avatar = Avatar.getAvatarFromID(Integer.parseInt(data[i++]));
System.out.println("Updated Avatar for Player "+displayName+" with Avatar "+avatar.displayName); //System.out.println("Updated Avatar for Player "+displayName+" with Avatar "+avatar.displayName);
playtime = Integer.parseInt(data[i++]); playtime = Integer.parseInt(data[i++]);
healthUps = Integer.parseInt(data[i++]); healthUps = Integer.parseInt(data[i++]);
manaUps = Integer.parseInt(data[i++]); manaUps = Integer.parseInt(data[i++]);
@ -415,11 +421,12 @@ public class Profile {
if (gamemode!=-1) { if (gamemode!=-1) {
switch (gamemode) { switch (gamemode) {
case 0:{ //Egg Hunt. case 0:{ //Egg Hunt.
try { if (session.eggCount>0) {
spacing = width/session.eggCount; spacing = width/session.eggCount;
rainbowEggLimit = session.eggCount; rainbowEggLimit = session.eggCount;
} catch (java.lang.ArithmeticException e) { } else {
spacing = width/5;
rainbowEggLimit = session.eggCount;
} }
Image img = RabiRaceModule.image_map.get("easter_egg.png"); Image img = RabiRaceModule.image_map.get("easter_egg.png");
for (int i=0;i<session.eggCount;i++) { for (int i=0;i<session.eggCount;i++) {
@ -441,7 +448,7 @@ public class Profile {
DrawUtils.drawImageScaled(g2, item.getImage(), (int)(border+i*spacing),(int)(36+16),icon_size*2, icon_size*2,new Color(0,0,0,192),sigIRC.panel); DrawUtils.drawImageScaled(g2, item.getImage(), (int)(border+i*spacing),(int)(36+16),icon_size*2, icon_size*2,new Color(0,0,0,192),sigIRC.panel);
} }
} }
} }break;
} }
} else { } else {
shiftyval = -RabiRaceModule.image_map.get("easter_egg.png").getWidth(sigIRC.panel)/2; shiftyval = -RabiRaceModule.image_map.get("easter_egg.png").getWidth(sigIRC.panel)/2;