Upstream
/
war
mirror of https://github.com/taoneill/war.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/1.8.1' into develop 

Conflicts:
	war/pom.xml
	war/src/main/resources/plugin.yml
This commit is contained in:
taoneill 2014-05-04 17:39:31 -04:00
parent 463d51d41b e229f9fc4e
commit 5e93ab6bc4
2 changed files with 5 additions and 5 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 {

6
war/src/main/resources/messages.properties
View File

@ -101,7 +101,7 @@ zone.loadout.equip = Equipped {0} loadout (sneak to switch).
zone.loadout.reenter = Can't change loadout after exiting the spawn. 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.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.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.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.noteamnotice = You can't be inside a warzone without a team.
zone.score.board404 = This warzone has not enabled a scoreboard. zone.score.board404 = This warzone has not enabled a scoreboard.
@ -109,13 +109,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.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.spawn.timer = You can''t leave spawn for {0} second(s) after respawning!
zone.steal.bomb.broadcast = {0} has bomb {1}. 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.bomb.prevent = Prevent {0} from reaching your spawn with the bomb!
zone.steal.cake.broadcast = {0} has cake {1}. 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.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.cake.prevent = Prevent {0} from reaching their spawn with the cake!
zone.steal.flag.broadcast = {0} stole team {1}''s flag. 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.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.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! zone.stealextra.bomb = You can only steal one bomb at a time!