From 1ad05dd5f331a950929f6b21ad329c88c9dedf7e Mon Sep 17 00:00:00 2001 From: cmastudios Date: Tue, 4 Mar 2014 23:49:41 -0600 Subject: [PATCH 1/3] Bump version to 1.8.1 --- war/pom.xml | 2 +- war/src/main/resources/plugin.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/war/pom.xml b/war/pom.xml index 53f49f2..e9d54ae 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tommytony war - 1.8 + 1.8.1 jar War http://war.tommytony.com diff --git a/war/src/main/resources/plugin.yml b/war/src/main/resources/plugin.yml index a5ff275..e4dea9b 100644 --- a/war/src/main/resources/plugin.yml +++ b/war/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: War -version: 1.8 (Nimitz) +version: 1.8.1 (Nimitz) description: Minecraft PVP arenas (called warzones) for a fast-paced and structured PVP experience with TDM, CTF & more! author: tommytony website: http://war.tommytony.com From 367f5d1a73fed1039e164fbe3327eeae094e52e0 Mon Sep 17 00:00:00 2001 From: Master-chan Date: Mon, 3 Mar 2014 20:02:28 +0600 Subject: [PATCH 2/3] 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 { From e229f9fc4e8c8f432f4a687073a663f9f09da982 Mon Sep 17 00:00:00 2001 From: cmastudios Date: Fri, 21 Mar 2014 19:39:44 -0500 Subject: [PATCH 3/3] Correct spelling and grammar * Fix unescaped quotes causing resourcebundle message breakage. * Fix verb tense of 'loses' * Fix spelling of 'monument' Closes #761 --- war/src/main/resources/messages.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/war/src/main/resources/messages.properties b/war/src/main/resources/messages.properties index 1519c23..59c3727 100644 --- a/war/src/main/resources/messages.properties +++ b/war/src/main/resources/messages.properties @@ -97,7 +97,7 @@ zone.loadout.equip = Equipped {0} loadout (sneak to switch). zone.loadout.reenter = Can't change loadout after exiting the spawn. zone.monument.badblock = You must capture a monument with a block of your team's wool color. Get one from your team spawn. zone.monument.capture = Monument {0} has been captured by team {1}. -zone.monument.lose = Team {0} loses control of mounment {1} +zone.monument.lose = Team {0} lost control of monument {1}. zone.monument.voodoo = Your dance pleases the monument''s voodoo. You gain {0} heart(s)! zone.noteamnotice = You can't be inside a warzone without a team. zone.score.board404 = This warzone has not enabled a scoreboard. @@ -105,13 +105,13 @@ zone.score.empty = You can't score until at least one player joins another team. zone.spawn.minplayers = You can''t leave spawn until there''s a minimum of {0} player(s) on at least {1} team(s). zone.spawn.timer = You can''t leave spawn for {0} second(s) after respawning! zone.steal.bomb.broadcast = {0} has bomb {1}. -zone.steal.bomb.notice = You have bomb {0}. Reach another team's spawn to score. Don't get touched by anyone or you'll blow up! +zone.steal.bomb.notice = You have bomb {0}. Reach another team''s spawn to score. Don''t get touched by anyone or you''ll blow up! zone.steal.bomb.prevent = Prevent {0} from reaching your spawn with the bomb! zone.steal.cake.broadcast = {0} has cake {1}. zone.steal.cake.notice = You have cake {0}. Reach your team''s spawn to score and replenish your lifepool. zone.steal.cake.prevent = Prevent {0} from reaching their spawn with the cake! zone.steal.flag.broadcast = {0} stole team {1}''s flag. -zone.steal.flag.empty = You can't steal team {0}'s flag since no players are on that team. +zone.steal.flag.empty = You can''t steal team {0}''s flag since no players are on that team. zone.steal.flag.notice = You have team {0}''s flag. Reach your team spawn or flag to capture it! zone.steal.flag.prevent = Prevent {0} from reaching team {1}''s spawn or flag. zone.stealextra.bomb = You can only steal one bomb at a time!