diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java index f707b34e6..54cfe9b0e 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java @@ -33,7 +33,10 @@ public class MountCannonGoal extends ObjectiveGoal @Override protected void clean(Player player, TutorialRegion region) { - getObjective().getCannons().remove(player.getName()).kill(); + // This cannon could be removed from the tutorial already in BlowUpWallGoal, we need to check if its null + Cannon cannon = getObjective().getCannons().remove(player.getName()); + if (cannon != null) + cannon.kill(); } @Override