From 3412082f371242e1598740e519ecbd42f0c2c33a Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 1 Apr 2016 00:33:42 +0100 Subject: [PATCH 1/4] PC-61 - Remove all diamonds from inventory after sell diamonds objective --- .../clans/objective/goals/fields/SellDiamondsGoal.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java index 1ff580789..1a14e6a3c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilPlayer; import mineplex.game.clans.clans.event.ClansPlayerSellItemEvent; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; @@ -34,6 +35,7 @@ public class SellDiamondsGoal extends ObjectiveGoal { // Close Middle Gate getObjective().getPlugin().destroyFences(getObjective().getPlugin().getRegion(player), DyeColor.RED); + // Close Fields Gate getObjective().getPlugin().destroyFences(getObjective().getPlugin().getRegion(player), DyeColor.BLACK); } @@ -45,6 +47,7 @@ public class SellDiamondsGoal extends ObjectiveGoal { if (event.getItem().getType() == Material.DIAMOND) { + UtilInv.removeAll(event.getPlayer(), Material.DIAMOND, (byte) 0); finish(event.getPlayer()); } else From d0bc40b9911d581e5ce909b82613decfbfd587ef Mon Sep 17 00:00:00 2001 From: phobia Date: Fri, 1 Apr 2016 14:01:38 +1100 Subject: [PATCH 2/4] PC-56 and PC-65 --- .../gui/events/ClansButtonClickEvent.java | 2 +- .../tutorials/clans/ClansMainTutorial.java | 37 +++++-------------- .../objective/goals/clan/BuildHouseGoal.java | 2 +- .../goals/classes/UseBullsChargeGoal.java | 15 +++++++- .../goals/finalobj/DisbandClanGoal.java | 1 + 5 files changed, 26 insertions(+), 31 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/events/ClansButtonClickEvent.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/events/ClansButtonClickEvent.java index 72bad2675..516336d75 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/events/ClansButtonClickEvent.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/gui/events/ClansButtonClickEvent.java @@ -34,7 +34,7 @@ public class ClansButtonClickEvent extends Event return _cancelled; } - public ButtonType getButtonType() { return _type} + public ButtonType getButtonType() { return _type; } public HandlerList getHandlers() { 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 d037671f2..cac6eaf04 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 @@ -15,13 +15,12 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.player.PlayerDropItemEvent; 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; @@ -30,7 +29,6 @@ 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; @@ -131,27 +129,6 @@ public class ClansMainTutorial extends Tutorial player.getInventory().clear(); ClansManager.getInstance().getPvpTimer().pause(player); - - // Spawn Holograms - addHologram(player, - getPoint(region, ClansMainTutorial.Point.SPAWN).add(0, 1.5, -6), - C.cGoldB + "Welcome to the Clans Tutorial!", - " ", - "This will teach you the basics of Clans.", - "It will take about 5 minutes to complete.", - "You must complete it before playing Clans.", - " ", - "Walk forward to begin!"); - - 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 @@ -255,10 +232,16 @@ public class ClansMainTutorial extends Tutorial @EventHandler public void breakBlock(BlockBreakEvent event) { - System.out.println("main break"); if (isInTutorial(event.getPlayer())) { - System.out.println("cencelled"); + event.setCancelled(true); + } + } + + @EventHandler + public void placeBlock(BlockPlaceEvent event) { + if (isInTutorial(event.getPlayer())) + { event.setCancelled(true); } } @@ -406,7 +389,7 @@ public class ClansMainTutorial extends Tutorial @EventHandler (priority = EventPriority.LOWEST) public void onClick(ClansButtonClickEvent event) { - if(isInTutorial(event.getPlayer())) + if(isInTutorial(event.getPlayer())) event.setCancelled(true); } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java index 15ab7376b..86d20ea1b 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java @@ -78,7 +78,7 @@ public class BuildHouseGoal extends ObjectiveGoal } } - @EventHandler + @EventHandler (priority = EventPriority.HIGHEST) public void blockPlace(BlockPlaceEvent event) { if (!contains(event.getPlayer())) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java index 720448e01..0c2754c18 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java @@ -1,5 +1,9 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.classes; +import mineplex.game.clans.clans.ClansManager; +import mineplex.minecraft.game.classcombat.Class.ClassManager; +import mineplex.minecraft.game.classcombat.Class.ClientClass; +import mineplex.minecraft.game.classcombat.Class.IPvpClass; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -15,8 +19,15 @@ public class UseBullsChargeGoal extends ObjectiveGoal } @Override - protected void customStart(Player player) - { + protected void customStart(Player player) { + ClientClass client = ClansManager.getInstance().getClassManager().Get(player); + + for(IPvpClass clazz: ClansManager.getInstance().getClassManager().GetAllClasses()) { + if(clazz.GetName().toLowerCase().contains("default")) { + client.SetGameClass(clazz); + break; + } + } } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/DisbandClanGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/DisbandClanGoal.java index fedb379bf..e31792c35 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/DisbandClanGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/DisbandClanGoal.java @@ -30,6 +30,7 @@ public class DisbandClanGoal extends ObjectiveGoal @Override protected void customFinish(Player player) { + ClansManager.getInstance().resetLeftTimer(player.getUniqueId()); } @EventHandler(priority = EventPriority.HIGHEST) From fe41e79e8aa3e3ce087700f1c2261dde3abab57d Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Fri, 1 Apr 2016 01:55:08 -0500 Subject: [PATCH 3/4] Fixes: 10 minute timer for creating clan after tutorial. CCM with LeaveSpawnGoal Synchronous database calls. --- .../clans/clans/ClansDataAccessLayer.java | 19 ++++++++++++++++--- .../tutorials/clans/ClansMainTutorial.java | 1 + .../objective/goals/clan/CreateClanGoal.java | 1 + .../objective/goals/clan/LeaveSpawnGoal.java | 12 +++++++++++- .../goals/finalobj/DisbandClanGoal.java | 1 + 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java index c7e601cc4..7e991faaf 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java @@ -785,8 +785,14 @@ public class ClansDataAccessLayer // Memory claim.Safe = !claim.Safe; - // Save - _repository.updateTerritoryClaim(claim.Chunk, claim.Safe); + runAsync(new Runnable() + { + @Override + public void run() + { + _repository.updateTerritoryClaim(claim.Chunk, claim.Safe); + } + }); // Log _manager.log("Safe Zone at [" + claim.Chunk + "] set to [" + claim.Safe + "] by [" + player + "]."); @@ -807,7 +813,14 @@ public class ClansDataAccessLayer public void clanExists(String clanName, Callback callback) { - _repository.clanExists(clanName, callback); + runAsync(new Runnable() + { + @Override + public void run() + { + _repository.clanExists(clanName, callback); + } + }); } public ClanRepository getRepository() 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 d037671f2..c9d1b2b52 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 @@ -93,6 +93,7 @@ public class ClansMainTutorial extends Tutorial player.teleport(Spawn.getNorthSpawn()); + ClansManager.getInstance().getItemMapManager().setMap(player); ClansManager.getInstance().getPvpTimer().unpause(player); /* diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/CreateClanGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/CreateClanGoal.java index 49a4c17e5..010847631 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/CreateClanGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/CreateClanGoal.java @@ -47,6 +47,7 @@ public class CreateClanGoal extends ObjectiveGoal if (contains(event.getFounder())) { finish(event.getFounder()); + ClansManager.getInstance().resetLeftTimer(event.getFounder().getUniqueId()); } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java index c976aae6b..94a7a404d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java @@ -1,5 +1,6 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan; +import java.util.HashSet; import java.util.UUID; import org.bukkit.Bukkit; @@ -17,6 +18,8 @@ import mineplex.game.clans.tutorial.tutorials.clans.objective.ClanObjective; public class LeaveSpawnGoal extends ObjectiveGoal { + private HashSet _removeList = new HashSet(); + public LeaveSpawnGoal(ClanObjective objective) { super( @@ -62,8 +65,15 @@ public class LeaveSpawnGoal extends ObjectiveGoal Player player = Bukkit.getPlayer(uuid); if (!getObjective().getPlugin().isIn(player, ClansMainTutorial.Bounds.SPAWN)) { - finish(player); + _removeList.add(uuid); } } + + for (UUID uuid : _removeList) + { + finish(Bukkit.getPlayer(uuid)); + } + + _removeList.clear(); } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/DisbandClanGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/DisbandClanGoal.java index fb1aa9210..198b1ce6a 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/DisbandClanGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/DisbandClanGoal.java @@ -50,6 +50,7 @@ public class DisbandClanGoal extends ObjectiveGoal UtilPlayer.message(event.getDisbander(), F.main("Clans", "You have disbanded your Tutorial Clan.")); ClansManager.getInstance().getClanDataAccess().delete(ClansManager.getInstance().getClan(event.getDisbander()), null); + ClansManager.getInstance().resetLeftTimer(event.getDisbander().getUniqueId()); finish(event.getDisbander()); } From 42fd210b20b146417153e494e0684bd28592dd8e Mon Sep 17 00:00:00 2001 From: phobia Date: Fri, 1 Apr 2016 21:51:31 +1100 Subject: [PATCH 4/4] PC-56 --- .../clans/tutorial/objective/Objective.java | 4 +-- .../goals/attackenemy/BlowUpWallGoal.java | 4 +-- .../objective/goals/clan/BuildHouseGoal.java | 9 ++++-- .../goals/classes/UseBullsChargeGoal.java | 29 +++++++++---------- .../goals/fields/MineDiamondsGoal.java | 3 -- .../goals/finalobj/TpClanHomeGoal.java | 1 - 6 files changed, 23 insertions(+), 27 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java index 839a92901..fd614fe24 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java @@ -264,12 +264,12 @@ public abstract class Objective public void siegeWeaponExplode(SiegeWeaponExplodeEvent event) { Player shooter = event.getProjectile().getShooter(); - - System.out.println(shooter.getName()); - + if (!contains(shooter)) { if (getObjective().getPlugin().isInTutorial(shooter)) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java index 7b77783fd..0187a6f98 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java @@ -69,7 +69,9 @@ public class BuildHouseGoal extends ObjectiveGoal { return; } - + + + for (ItemStack stack : _items) { if (event.getBlock().getType().equals(stack.getType()) || event.getBlock().getType().equals(Material.IRON_DOOR_BLOCK)) @@ -91,7 +93,10 @@ public class BuildHouseGoal extends ObjectiveGoal { return; } - + + event.setCancelled(false); + + if (isInBuildArea(event.getPlayer(), event.getBlock())) { // Run 1 tick later because inventory doesn't get updated instantly diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java index aa71751e8..d2a716d2a 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java @@ -1,20 +1,23 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.classes; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilEvent; import mineplex.game.clans.clans.ClansManager; import mineplex.minecraft.game.classcombat.Class.ClassManager; import mineplex.minecraft.game.classcombat.Class.ClientClass; import mineplex.minecraft.game.classcombat.Class.IPvpClass; +import mineplex.minecraft.game.classcombat.Class.event.ClassEquipEvent; +import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.game.clans.tutorial.tutorials.clans.objective.ClassesObjective; import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent; +import org.bukkit.event.player.PlayerInteractEvent; -public class UseBullsChargeGoal extends ObjectiveGoal -{ - public UseBullsChargeGoal(ClassesObjective objective) - { +public class UseBullsChargeGoal extends ObjectiveGoal { + public UseBullsChargeGoal(ClassesObjective objective) { super( objective, "Use Bulls Charge", @@ -28,26 +31,20 @@ public class UseBullsChargeGoal extends ObjectiveGoal protected void customStart(Player player) { ClientClass client = ClansManager.getInstance().getClassManager().Get(player); - for(IPvpClass clazz: ClansManager.getInstance().getClassManager().GetAllClasses()) { - if(clazz.GetName().toLowerCase().contains("default")) { - client.SetGameClass(clazz); - break; - } - } + client.ResetSkills(player); + client.SetActiveCustomBuild(client.GetGameClass(), client.GetGameClass().getDefaultBuild()); } @Override - protected void customFinish(Player player) - { + protected void customFinish(Player player) { } @EventHandler - public void checkSkill(SkillTriggerEvent event) - { - if (contains(event.GetPlayer())) - { + public void checkSkill(SkillTriggerEvent event) { + if (contains(event.GetPlayer())) { if (event.GetSkillName().toLowerCase().contains("bulls charge")) finish(event.GetPlayer()); } } + } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java index 34a47fdd7..47506ed95 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java @@ -59,15 +59,12 @@ public class MineDiamondsGoal extends ObjectiveGoal @EventHandler(priority = EventPriority.HIGHEST) public void onBlockBreak(BlockBreakEvent event) { - System.out.println("a"); if (!contains(event.getPlayer()) || event.getBlock().getType() != Material.DIAMOND_ORE) return; - System.out.println("b"); TutorialRegion region = getObjective().getPlugin().getRegion(event.getPlayer()); if (getObjective().getPlugin().isIn(event.getBlock().getLocation(), region, ClansMainTutorial.Bounds.FIELDS)) { - System.out.println("c"); event.setCancelled(true); event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation().add(0.5, 1.5, 0.5), new ItemStack(Material.DIAMOND)); event.getBlock().setType(Material.COBBLESTONE); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java index 030bb18c8..c7b189ec5 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java @@ -13,7 +13,6 @@ import mineplex.game.clans.tutorial.objective.Objective; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; -import mineplex.game.clans.clans.event.ClansCommandExecutedEvent; import mineplex.game.clans.tutorial.tutorials.clans.objective.FinalObjective; public class TpClanHomeGoal extends ObjectiveGoal