From 367f5d1a73fed1039e164fbe3327eeae094e52e0 Mon Sep 17 00:00:00 2001 From: Master-chan Date: Mon, 3 Mar 2014 20:02:28 +0600 Subject: [PATCH] Fixes NPE when deadly adjectives is empty For example with russian translation --- .../main/java/com/tommytony/war/event/WarEntityListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/war/src/main/java/com/tommytony/war/event/WarEntityListener.java b/war/src/main/java/com/tommytony/war/event/WarEntityListener.java index a7c9608..09f82f3 100644 --- a/war/src/main/java/com/tommytony/war/event/WarEntityListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarEntityListener.java @@ -149,8 +149,8 @@ public class WarEntityListener implements Listener { } else if (event.getDamager() instanceof Projectile) { weaponString = War.war.getString("pvp.kill.weapon.aim"); } - String adjectiveString = War.war.getDeadlyAdjectives().get(this.killSeed.nextInt(War.war.getDeadlyAdjectives().size())); - String verbString = War.war.getKillerVerbs().get(this.killSeed.nextInt(War.war.getKillerVerbs().size())); + String adjectiveString = War.war.getDeadlyAdjectives().isEmpty() ? "" : War.war.getDeadlyAdjectives().get(this.killSeed.nextInt(War.war.getDeadlyAdjectives().size())); + String verbString = War.war.getKillerVerbs().isEmpty() ? "" : War.war.getKillerVerbs().get(this.killSeed.nextInt(War.war.getKillerVerbs().size())); defenderWarzone.broadcast("pvp.kill.format", attackerString + ChatColor.WHITE, adjectiveString, weaponString.toLowerCase().replace('_', ' '), verbString, defenderString); } else {