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 0922cc1..a483e6d 100644 --- a/war/src/main/java/com/tommytony/war/event/WarEntityListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarEntityListener.java @@ -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 diff --git a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java index 5ce75e0..1748f5e 100644 --- a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java @@ -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()); }