From 630281c6632bb1f2937bea37f439300d858220b7 Mon Sep 17 00:00:00 2001 From: Chiss Date: Sun, 17 Nov 2013 09:53:53 +1100 Subject: [PATCH] SSM Hunger Fix --- .../arcade/game/games/hideseek/forms/BlockForm.java | 2 +- .../game/arcade/game/games/smash/SuperSmash.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java index 77adbba82..e17a68418 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java @@ -60,7 +60,7 @@ public class BlockForm extends Form //Player > Chicken DisguiseChicken disguise = new DisguiseChicken(Player); - disguise.setBaby(); + disguise.setBaby(); disguise.setSoundDisguise(new DisguiseCat(Player)); Host.Manager.GetDisguise().disguise(disguise); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java index db70ce59d..5a28dc119 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java @@ -342,7 +342,7 @@ public class SuperSmash extends SoloGame if (!IsLive()) return; - hungerTick = (hungerTick + 1)%8; + hungerTick = (hungerTick + 1)%10; for (Player player : GetPlayers(true)) { @@ -363,21 +363,21 @@ public class SuperSmash extends SoloGame @EventHandler(priority = EventPriority.MONITOR) public void HungerRestore(CustomDamageEvent event) { + if (event.IsCancelled()) return; - if (event.GetDamagerPlayer(true) != null) + if (event.GetDamagerPlayer(true) == null) return; - + Player damager = event.GetDamagerPlayer(true); if (damager == null) return; - + if (!Recharge.Instance.use(damager, "Hunger Restore", 250, false)) return; - + int amount = Math.max(1, (int)(event.GetDamage()/2)); UtilPlayer.hunger(damager, amount); } - }