From 40c52ac5571e88609435c24d11ee3f00c961998d Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Sat, 16 Jan 2016 08:25:30 +0000 Subject: [PATCH] made it so that cannons don't rely on outposts. this should help with testing them without needing an outpost --- .../src/mineplex/game/clans/clans/siege/cannon/Cannon.java | 4 +--- .../src/mineplex/game/clans/clans/siege/outpost/Outpost.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/cannon/Cannon.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/cannon/Cannon.java index f5502e2fb..9b6a96abc 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/cannon/Cannon.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/cannon/Cannon.java @@ -32,7 +32,6 @@ public class Cannon implements Listener private Location _location; private CannonState _state; - private Outpost _outpost; private Player _rider; @@ -41,9 +40,8 @@ public class Cannon implements Listener private Slime _filler; private Slime _filler2; - public Cannon(Outpost outpost, Location location) + public Cannon(Location location) { - _outpost = outpost; _location = location; _state = CannonState.UNLOADED; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java index c1fab01bd..50c63eee6 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java @@ -518,7 +518,7 @@ public class Outpost implements Listener public void spawnCannon(Player player, Location location) { - Cannon cannon = new Cannon(this, location); + Cannon cannon = new Cannon(location); _host.getPlugin().getServer().getPluginManager().registerEvents(cannon, _host.getPlugin()); _cannons.add(cannon);