From 08b5e7b4db1668ed570070a0c008576445a2bfc5 Mon Sep 17 00:00:00 2001 From: William Burns Date: Wed, 23 Dec 2015 09:21:43 +0000 Subject: [PATCH] Working loadouts. --- .../game/arcade/game/games/gladiators/Gladiators.java | 11 +++++++---- .../game/games/gladiators/hotbar/HotbarEditor.java | 6 ++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java index 458e7ea83..66701b54a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java @@ -186,6 +186,9 @@ public class Gladiators extends SoloGame if (e.getType() != UpdateType.FASTEST) return; + if (!IsLive()) + return; + if (GetState() != GameState.Prepare) return; @@ -749,10 +752,10 @@ public class Gladiators extends SoloGame p.getInventory().clear(); p.getInventory().setArmorContents(null); - p.getInventory().setItem(layout.getSword() - 1, UtilItem.makeUnbreakable(type.getLoadout().getSword())); - p.getInventory().setItem(layout.getRod() - 1, UtilItem.makeUnbreakable(type.getLoadout().getRod())); - p.getInventory().setItem(layout.getBow() - 1, type.getLoadout().getBow()); - p.getInventory().setItem(layout.getArrows() - 1, type.getLoadout().getArrows()); + p.getInventory().setItem(layout.getSword(), UtilItem.makeUnbreakable(type.getLoadout().getSword())); + p.getInventory().setItem(layout.getRod(), UtilItem.makeUnbreakable(type.getLoadout().getRod())); + p.getInventory().setItem(layout.getBow(), type.getLoadout().getBow()); + p.getInventory().setItem(layout.getArrows(), type.getLoadout().getArrows()); p.getInventory().setHelmet(type.getLoadout().getHelmet()); p.getInventory().setChestplate(type.getLoadout().getChestplate()); 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 119e4d436..518b86d96 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 @@ -52,6 +52,9 @@ public class HotbarEditor extends MiniPlugin @EventHandler public void onJoin(PlayerJoinEvent event) { + if (_host.Manager.GetGame() != _host) + return; + if (_host.GetState() == Game.GameState.Recruit || _host.GetState() == Game.GameState.Live) { event.getPlayer().getInventory().setItem(0, _item); @@ -89,6 +92,9 @@ public class HotbarEditor extends MiniPlugin @EventHandler public void onJoin(GameStateChangeEvent event) { + if (event.GetGame() != _host) + return; + if (event.GetState() == Game.GameState.Recruit) { for (Player player : Bukkit.getOnlinePlayers())