From cda092ffac0901b79f7d8b9eaf44083db02d3a93 Mon Sep 17 00:00:00 2001 From: Steffion Date: Sat, 10 Aug 2013 20:59:24 +0200 Subject: [PATCH] * Added if null check to prevent NPE spam. --- src/nl/Steffion/BlockHunt/SignsHandler.java | 114 ++++++++++---------- 1 file changed, 60 insertions(+), 54 deletions(-) diff --git a/src/nl/Steffion/BlockHunt/SignsHandler.java b/src/nl/Steffion/BlockHunt/SignsHandler.java index baf9a32..80e8db8 100644 --- a/src/nl/Steffion/BlockHunt/SignsHandler.java +++ b/src/nl/Steffion/BlockHunt/SignsHandler.java @@ -116,25 +116,27 @@ public class SignsHandler { ConfigC.sign_WAITING .getLocation()); int linecount = 0; - for (String line : signLines) { - if (linecount <= 3) { - signblock - .setLine( - linecount, - MessageM.replaceAll( - line, - "arenaname-" - + arena.arenaName, - "players-" - + arena.playersInArena - .size(), - "maxplayers-" - + arena.maxPlayers, - "timeleft-" - + arena.timer)); - } + if (signLines != null) { + for (String line : signLines) { + if (linecount <= 3) { + signblock + .setLine( + linecount, + MessageM.replaceAll( + line, + "arenaname-" + + arena.arenaName, + "players-" + + arena.playersInArena + .size(), + "maxplayers-" + + arena.maxPlayers, + "timeleft-" + + arena.timer)); + } - linecount = linecount + 1; + linecount = linecount + 1; + } } signblock.update(); } else if (arena.gameState @@ -144,25 +146,27 @@ public class SignsHandler { ConfigC.sign_STARTING .getLocation()); int linecount = 0; - for (String line : signLines) { - if (linecount <= 3) { - signblock - .setLine( - linecount, - MessageM.replaceAll( - line, - "arenaname-" - + arena.arenaName, - "players-" - + arena.playersInArena - .size(), - "maxplayers-" - + arena.maxPlayers, - "timeleft-" - + arena.timer)); - } + if (signLines != null) { + for (String line : signLines) { + if (linecount <= 3) { + signblock + .setLine( + linecount, + MessageM.replaceAll( + line, + "arenaname-" + + arena.arenaName, + "players-" + + arena.playersInArena + .size(), + "maxplayers-" + + arena.maxPlayers, + "timeleft-" + + arena.timer)); + } - linecount = linecount + 1; + linecount = linecount + 1; + } } signblock.update(); } else if (arena.gameState @@ -172,25 +176,27 @@ public class SignsHandler { ConfigC.sign_INGAME .getLocation()); int linecount = 0; - for (String line : signLines) { - if (linecount <= 3) { - signblock - .setLine( - linecount, - MessageM.replaceAll( - line, - "arenaname-" - + arena.arenaName, - "players-" - + arena.playersInArena - .size(), - "maxplayers-" - + arena.maxPlayers, - "timeleft-" - + arena.timer)); - } + if (signLines != null) { + for (String line : signLines) { + if (linecount <= 3) { + signblock + .setLine( + linecount, + MessageM.replaceAll( + line, + "arenaname-" + + arena.arenaName, + "players-" + + arena.playersInArena + .size(), + "maxplayers-" + + arena.maxPlayers, + "timeleft-" + + arena.timer)); + } - linecount = linecount + 1; + linecount = linecount + 1; + } } signblock.update(); }