From 0b5e409ab8c4c48d9bc5167b6f4ce31af8b0e173 Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Sat, 18 Jun 2016 21:02:54 +0300 Subject: [PATCH] Make /lose available for all to use on QA testing --- .../game/games/mineware/BawkBawkBattles.java | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java index 1ce2e68c7..58e40f1b0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java @@ -200,7 +200,6 @@ public class BawkBawkBattles extends TeamGame implements IThrown "Last player with lives wins.", }); - // Damage = false; DamagePvP = false; DamagePvE = false; DamageEvP = false; @@ -394,10 +393,6 @@ public class BawkBawkBattles extends TeamGame implements IThrown boolean criteria = participants >= minCount && participants <= maxCount; - System.out.println("Participants: " + participants); - System.out.println("Min: " + minCount); - System.out.println("Max: " + maxCount); - if (settings.isTeamBased()) { return criteria && getPlayersWithRemainingLives() % 2 == 0; @@ -1457,23 +1452,24 @@ public class BawkBawkBattles extends TeamGame implements IThrown event.setCancelled(true); } - else if (message.startsWith("/" + _loseCommand)) - { - if (IsLive() && _challenge != null && IsAlive(player)) - { - setLives(player, 0); - _challenge.getData().addLostPlayer(player); - _deathEffect.playDeath(player, player.getLocation()); - GetScoreboard().ResetScore(player.getName()); - _chickenAttack.start(player); - } - else - { - UtilPlayer.message(player, F.main("Game", "You cannot lose at this time.")); - } + } - event.setCancelled(true); + if (message.startsWith("/" + _loseCommand)) + { + if (IsLive() && _challenge != null && IsAlive(player)) + { + setLives(player, 0); + _challenge.getData().addLostPlayer(player); + _deathEffect.playDeath(player, player.getLocation()); + GetScoreboard().ResetScore(player.getName()); + _chickenAttack.start(player); } + else + { + UtilPlayer.message(player, F.main("Game", "You cannot lose at this time.")); + } + + event.setCancelled(true); } }