Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-09-27 22:18:11 +02:00
Code Issues Projects Releases Wiki Activity

Made potion effects less frequent when stealing flag or cake, because they got on my nerves. Wish I could disable the sound for an effect from the server.

Browse Source
This commit is contained in:
taoneill 2012-01-28 12:27:33 -05:00
parent a9c09c3f16
commit 4b69b14e10
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,11 @@ public class WarEntityListener implements Listener {
// Blow up bomb
defenderWarzone.getWorld().createExplosion(a.getLocation(), 2F);
// bring back tnt
bomb.getVolume().resetBlocks();
bomb.addBombBlocks();
// Notify everyone
for (Team t : defenderWarzone.getTeams()) {
if (War.war.isSpoutServer()) {
@ -209,13 +213,10 @@ public class WarEntityListener implements Listener {
}
}
// bring back tnt
bomb.getVolume().resetBlocks();
bomb.addBombBlocks();
t.teamcast(attackerTeam.getKind().getColor() + a.getName() + ChatColor.WHITE
+ " made " + defenderTeam.getKind().getColor() + d.getName() + ChatColor.WHITE + " blow up!");
}
}
} else if (attackerTeam != null && defenderTeam != null && attackerTeam == defenderTeam && attackerWarzone == defenderWarzone && attacker.getEntityId() != defender.getEntityId()) {
// same team, but not same person

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

@ -503,7 +503,7 @@ public class WarPlayerListener implements Listener {
// Flag capture
if (playerWarzone.isFlagThief(player.getName())) {
// smoky
if (System.currentTimeMillis() % 3 == 0) {
if (System.currentTimeMillis() % 13 == 0) {
playerWarzone.getWorld().playEffect(player.getLocation(), Effect.POTION_BREAK, playerTeam.getKind().getPotionEffectColor());
}
@ -654,7 +654,7 @@ public class WarPlayerListener implements Listener {
// Cake retrieval
if (playerWarzone.isCakeThief(player.getName())) {
// smoky
if (System.currentTimeMillis() % 3 == 0) {
if (System.currentTimeMillis() % 13 == 0) {
playerWarzone.getWorld().playEffect(player.getLocation(), Effect.POTION_BREAK, playerTeam.getKind().getPotionEffectColor());
}