From c54587590bd962785ab8a691fd972038b9b320cc Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 23 Jul 2018 01:28:50 +0100 Subject: [PATCH] More fixes --- .../src/mineplex/core/mission/MissionLength.java | 2 +- .../arcade/game/games/gladiators/hotbar/HotbarEditor.java | 8 +++++--- .../games/smash/perks/creeper/PerkCreeperElectricity.java | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionLength.java b/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionLength.java index 67218cc95..3907f79b9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionLength.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionLength.java @@ -12,7 +12,7 @@ public enum MissionLength { DAY("Daily", "tomorrow", UtilText.splitLineToArray(C.cGray + "Here you will find missions that reset every day. Missions only reset if you've completed them or you've discarded them, click on an active mission to discard it.", LineFormat.LORE), ChatColor.WHITE, 0, 1, Calendar.DAY_OF_WEEK), - WEEK("Weekly", "next week", UtilText.splitLineToArray(C.cGray + "These missions will rotate out every Monday. They are daily missions that have an increased objective and rewards.", LineFormat.LORE), ChatColor.GREEN, 7, 5, Calendar.WEEK_OF_YEAR), + WEEK("Weekly", "next week", UtilText.splitLineToArray(C.cGray + "These missions will rotate out every Monday. They are weekly missions that have an increased objective and rewards.", LineFormat.LORE), ChatColor.GREEN, 7, 5, Calendar.WEEK_OF_YEAR), EVENT("Event", null, UtilText.splitLineToArray(C.cGray + "These super special missions will only show up every once in a while and come with a super special reward!", LineFormat.LORE), ChatColor.LIGHT_PURPLE, 10, 1, -1); private final String _name, _resetWhen; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/hotbar/HotbarEditor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/hotbar/HotbarEditor.java index 76aec5115..0f523564b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/hotbar/HotbarEditor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/hotbar/HotbarEditor.java @@ -87,11 +87,13 @@ public class HotbarEditor extends Module @EventHandler(priority = EventPriority.HIGH) public void Observer(PlayerCommandPreprocessEvent event) { + if (getGame() == null || getGame().InProgress()) + { + return; + } + if (event.getMessage().equalsIgnoreCase("/spec")) { - if (getGame() == null) - return; - if (!getGame().IsAlive(event.getPlayer()) && !UtilInv.contains(event.getPlayer(), _item.getType(), (byte) 0, 1)) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperElectricity.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperElectricity.java index 476e3eca9..35ff94a5d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperElectricity.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperElectricity.java @@ -30,7 +30,7 @@ public class PerkCreeperElectricity extends Perk private int _damage; private float _knockbackMagnitude; - private Map _active = new HashMap<>(); + private final Map _active = new HashMap<>(); public PerkCreeperElectricity() { @@ -157,7 +157,7 @@ public class PerkCreeperElectricity extends Perk event.SetCancelled("Lightning Shield"); // Inform - UtilPlayer.message(damagee, F.main("Skill", "You hit " + F.elem(UtilEnt.getName(event.GetDamagerPlayer(false))) + " with " + F.skill(GetName()) + ".")); + UtilPlayer.message(damagee, F.main("Skill", "You hit " + F.elem(UtilEnt.getName(event.GetDamagerEntity(false))) + " with " + F.skill(GetName()) + ".")); // Elec damagee.getWorld().strikeLightningEffect(damagee.getLocation());