From b1b31f11355d8b9d794609c25357e2f77fed4e1c Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 31 Mar 2018 03:24:57 +0100 Subject: [PATCH] Fix issues QA found --- .../mineplex/core/gadget/gadgets/item/ItemMaryPoppins.java | 3 +++ .../game/arcade/game/modules/worldmap/WorldMapModule.java | 6 ++++++ .../src/nautilus/game/arcade/kit/perks/PerkHorsePet.java | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMaryPoppins.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMaryPoppins.java index 94da0cf5d..a0a653cb2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMaryPoppins.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMaryPoppins.java @@ -1,6 +1,8 @@ package mineplex.core.gadget.gadgets.item; import java.awt.*; +import java.time.Month; +import java.time.YearMonth; import java.util.concurrent.TimeUnit; import org.bukkit.Location; @@ -42,6 +44,7 @@ public class ItemMaryPoppins extends ItemGadget }, CostConstants.POWERPLAY_BONUS, Material.STICK, (byte) 0, TimeUnit.SECONDS.toMillis(20), null); Free = false; + setPPCYearMonth(YearMonth.of(2018, Month.APRIL)); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/worldmap/WorldMapModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/worldmap/WorldMapModule.java index 25a6dd29a..505ef91e2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/worldmap/WorldMapModule.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/worldmap/WorldMapModule.java @@ -39,6 +39,7 @@ import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; import mineplex.core.itemstack.ItemBuilder; import mineplex.core.updater.UpdateType; @@ -189,6 +190,11 @@ public class WorldMapModule extends Module { getGame().registerDebugCommand("map", Perm.MAP_COMMAND, PermissionGroup.PLAYER, (player, args) -> { + if (UtilPlayer.isSpectator(player)) + { + return; + } + Inventory inventory = player.getInventory(); inventory.remove(Material.MAP); inventory.addItem(getMapItem()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHorsePet.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHorsePet.java index c111d0507..fc23859d0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHorsePet.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHorsePet.java @@ -57,7 +57,7 @@ public class PerkHorsePet extends Perk { if (Manager.GetGame().InProgress()) { - Manager.runSyncLater(() -> spawnHorse(player, false), 45 * 20); + Manager.runSyncLater(() -> spawnHorse(player, false), 35 * 20); } }