From 3f2448e51f495817dceb419a1a16e309f97db4c3 Mon Sep 17 00:00:00 2001 From: snowleo Date: Fri, 18 Nov 2011 20:15:26 +0100 Subject: Null checks --- Essentials/src/com/earth2me/essentials/ManagedFile.java | 4 ++-- .../src/com/earth2me/essentials/commands/Commandhelp.java | 3 +++ .../src/com/earth2me/essentials/commands/Commandwarp.java | 14 +++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/ManagedFile.java b/Essentials/src/com/earth2me/essentials/ManagedFile.java index 673d8d835..9176024ae 100644 --- a/Essentials/src/com/earth2me/essentials/ManagedFile.java +++ b/Essentials/src/com/earth2me/essentials/ManagedFile.java @@ -129,12 +129,12 @@ public class ManagedFile try { String hash = reader.readLine(); - if (hash.matches("#[a-f0-9]{32}")) + if (hash != null && hash.matches("#[a-f0-9]{32}")) { hash = hash.substring(1); bais.reset(); final String versionline = reader.readLine(); - if (versionline.matches("#version: .+")) + if (versionline != null && versionline.matches("#version: .+")) { final String versioncheck = versionline.substring(10); if (!versioncheck.equalsIgnoreCase(version)) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java b/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java index 5ea0c3c85..6420bb196 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java @@ -101,6 +101,9 @@ public class Commandhelp extends EssentialsCommand while (bufferedReader.ready()) { final String line = bufferedReader.readLine(); + if (line == null) { + break; + } retval.add(line.replace('&', 'ยง')); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java index cbbf6a558..dce5faf41 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java @@ -55,7 +55,7 @@ public class Commandwarp extends EssentialsCommand { if (args.length < 2 || args[0].matches("[0-9]+")) { - warpList(null, args); + warpList(sender, args); throw new NoChargeException(); } User otherUser = ess.getUser(server.getPlayer(args[1])); @@ -68,7 +68,7 @@ public class Commandwarp extends EssentialsCommand } - private void warpList(User user, String[] args) throws Exception + private void warpList(CommandSender sender, String[] args) throws Exception { Warps warps = ess.getWarps(); if (warps.isEmpty()) @@ -77,13 +77,13 @@ public class Commandwarp extends EssentialsCommand } final List warpNameList = new ArrayList(warps.getWarpNames()); - if (user != null) + if (sender instanceof User) { final Iterator iterator = warpNameList.iterator(); while (iterator.hasNext()) { final String warpName = iterator.next(); - if (ess.getSettings().getPerWarpPermission() && !user.isAuthorized("essentials.warp." + warpName)) + if (ess.getSettings().getPerWarpPermission() && !((User)sender).isAuthorized("essentials.warp." + warpName)) { iterator.remove(); } @@ -100,11 +100,11 @@ public class Commandwarp extends EssentialsCommand if (warpNameList.size() > WARPS_PER_PAGE) { - user.sendMessage(Util.format("warpsCount", warpNameList.size(), page, (int)Math.ceil(warpNameList.size() / (double)WARPS_PER_PAGE))); - user.sendMessage(warpList); + sender.sendMessage(Util.format("warpsCount", warpNameList.size(), page, (int)Math.ceil(warpNameList.size() / (double)WARPS_PER_PAGE))); + sender.sendMessage(warpList); } else { - user.sendMessage(Util.format("warps", warpList)); + sender.sendMessage(Util.format("warps", warpList)); } } -- cgit v1.2.3