Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-01-07 00:08:25 +01:00
Code Issues Projects Releases Wiki Activity

Fixes NPE when deadly adjectives is empty

Browse Source 
For example with russian translation
This commit is contained in:
Master-chan 2014-03-03 20:02:28 +06:00 committed by cmastudios
parent 1ad05dd5f3
commit 367f5d1a73
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
war/src/main/java/com/tommytony/war/event/WarEntityListener.java
View File

@ -149,8 +149,8 @@ public class WarEntityListener implements Listener {
} else if (event.getDamager() instanceof Projectile) { } else if (event.getDamager() instanceof Projectile) {
weaponString = War.war.getString("pvp.kill.weapon.aim"); weaponString = War.war.getString("pvp.kill.weapon.aim");
} }
String adjectiveString = War.war.getDeadlyAdjectives().get(this.killSeed.nextInt(War.war.getDeadlyAdjectives().size())); String adjectiveString = War.war.getDeadlyAdjectives().isEmpty() ? "" : 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 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, defenderWarzone.broadcast("pvp.kill.format", attackerString + ChatColor.WHITE, adjectiveString,
weaponString.toLowerCase().replace('_', ' '), verbString, defenderString); weaponString.toLowerCase().replace('_', ' '), verbString, defenderString);
} else { } else {