EpicKnarvik97/BlockHunt
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

* Added if null check to prevent NPE spam.

Browse Source
This commit is contained in:
Steffion
2013-08-10 20:59:24 +02:00
parent 872cd6aef0
commit cda092ffac
1 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/nl/Steffion/BlockHunt/SignsHandler.java
View File

@@ -116,25 +116,27 @@ public class SignsHandler {
ConfigC.sign_WAITING ConfigC.sign_WAITING
.getLocation()); .getLocation());
int linecount = 0; int linecount = 0;
for (String line : signLines) { if (signLines != null) {
if (linecount <= 3) { for (String line : signLines) {
signblock if (linecount <= 3) {
.setLine( signblock
linecount, .setLine(
MessageM.replaceAll( linecount,
line, MessageM.replaceAll(
"arenaname-" line,
+ arena.arenaName, "arenaname-"
"players-" + arena.arenaName,
+ arena.playersInArena "players-"
.size(), + arena.playersInArena
"maxplayers-" .size(),
+ arena.maxPlayers, "maxplayers-"
"timeleft-" + arena.maxPlayers,
+ arena.timer)); "timeleft-"
} + arena.timer));
}
linecount = linecount + 1; linecount = linecount + 1;
}
} }
signblock.update(); signblock.update();
} else if (arena.gameState } else if (arena.gameState
@@ -144,25 +146,27 @@ public class SignsHandler {
ConfigC.sign_STARTING ConfigC.sign_STARTING
.getLocation()); .getLocation());
int linecount = 0; int linecount = 0;
for (String line : signLines) { if (signLines != null) {
if (linecount <= 3) { for (String line : signLines) {
signblock if (linecount <= 3) {
.setLine( signblock
linecount, .setLine(
MessageM.replaceAll( linecount,
line, MessageM.replaceAll(
"arenaname-" line,
+ arena.arenaName, "arenaname-"
"players-" + arena.arenaName,
+ arena.playersInArena "players-"
.size(), + arena.playersInArena
"maxplayers-" .size(),
+ arena.maxPlayers, "maxplayers-"
"timeleft-" + arena.maxPlayers,
+ arena.timer)); "timeleft-"
} + arena.timer));
}
linecount = linecount + 1; linecount = linecount + 1;
}
} }
signblock.update(); signblock.update();
} else if (arena.gameState } else if (arena.gameState
@@ -172,25 +176,27 @@ public class SignsHandler {
ConfigC.sign_INGAME ConfigC.sign_INGAME
.getLocation()); .getLocation());
int linecount = 0; int linecount = 0;
for (String line : signLines) { if (signLines != null) {
if (linecount <= 3) { for (String line : signLines) {
signblock if (linecount <= 3) {
.setLine( signblock
linecount, .setLine(
MessageM.replaceAll( linecount,
line, MessageM.replaceAll(
"arenaname-" line,
+ arena.arenaName, "arenaname-"
"players-" + arena.arenaName,
+ arena.playersInArena "players-"
.size(), + arena.playersInArena
"maxplayers-" .size(),
+ arena.maxPlayers, "maxplayers-"
"timeleft-" + arena.maxPlayers,
+ arena.timer)); "timeleft-"
} + arena.timer));
}
linecount = linecount + 1; linecount = linecount + 1;
}
} }
signblock.update(); signblock.update();
} }