From 5c2a9d5807de5bed7f9ab296d028c555771902c1 Mon Sep 17 00:00:00 2001 From: samczsun Date: Wed, 15 Jun 2016 21:34:34 -0400 Subject: [PATCH] Prefixes are too long or something --- .../clans/objective/goals/clan/CreateClanGoal.java | 9 --------- .../clans/objective/goals/finalobj/DisbandClanGoal.java | 6 +----- 2 files changed, 1 insertion(+), 14 deletions(-) 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 8413cdb5a..d44f63869 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 @@ -43,15 +43,6 @@ public class CreateClanGoal extends ObjectiveGoal } - @EventHandler - public void onClanPreCreate(ClanCreatedEvent event) - { - if (contains(event.getFounder())) - { - event.setName("TUTORIAL-" + event.getName()); - } - } - @EventHandler public void onClanCreate(ClanCreationCompleteEvent event) { 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 9de897421..e70f7009c 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 @@ -47,11 +47,7 @@ public class DisbandClanGoal extends ObjectiveGoal { return; } - if (!event.getClan().getName().startsWith("TUTORIAL-")) // How??? - { - UtilPlayer.message(event.getDisbander(), F.main("Clans", "Something has gone terribly wrong while disbanding your clan")); - return; - } + event.setCancelled(true); UtilPlayer.message(event.getDisbander(), F.main("Clans", "You have disbanded your Tutorial Clan."));