From 30a098c645292c350be11e51ca1cbe858eaddf7e Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 18:24:47 +1100 Subject: [PATCH] PC-49 - Kick players out of their clan when they start the tutorial if they have one (from previously playing the tutorial). --- .../clans/tutorial/tutorials/clans/ClansMainTutorial.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java index 6b05307e6..40fb5637e 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java @@ -20,6 +20,7 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.common.util.C; +import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilInv; @@ -28,6 +29,7 @@ import mineplex.core.hologram.HologramManager; import mineplex.core.npc.NpcManager; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; +import mineplex.game.clans.clans.ClanInfo; import mineplex.game.clans.clans.ClansManager; import mineplex.game.clans.clans.event.ClansCommandPreExecutedEvent; import mineplex.game.clans.economy.GoldManager; @@ -143,6 +145,12 @@ public class ClansMainTutorial extends Tutorial addHologram(player, getPoint(region, ClansMainTutorial.Point.SPAWN).add(0, 1.5, -23), "Jump Off!"); + + ClanInfo clan = ClansManager.getInstance().getClan(player); + if (clan != null) + { + ClansManager.getInstance().getClanDataAccess().delete(clan, null); + } } @Override