From d908e904a26d3a07ac37006392a0a6d954e0f7fa Mon Sep 17 00:00:00 2001 From: Acrobot Date: Sat, 16 Mar 2013 18:33:55 +0100 Subject: [PATCH] Remove teleportation bugfix Not needed anymore - we're targetting CraftBukkit 1.5 --- src/main/java/com/Acrobot/ChestShop/ChestShop.java | 5 ----- .../com/Acrobot/ChestShop/Configuration/Properties.java | 6 ------ 2 files changed, 11 deletions(-) diff --git a/src/main/java/com/Acrobot/ChestShop/ChestShop.java b/src/main/java/com/Acrobot/ChestShop/ChestShop.java index c8a14d0..592d339 100644 --- a/src/main/java/com/Acrobot/ChestShop/ChestShop.java +++ b/src/main/java/com/Acrobot/ChestShop/ChestShop.java @@ -26,7 +26,6 @@ import com.Acrobot.ChestShop.Listeners.PreTransaction.*; import com.Acrobot.ChestShop.Listeners.PreTransaction.ErrorMessageSender; import com.Acrobot.ChestShop.Listeners.PreTransaction.PermissionChecker; import com.Acrobot.ChestShop.Listeners.ShopRefundListener; -import com.Acrobot.ChestShop.Listeners.TeleportFixListener; import com.Acrobot.ChestShop.Logging.FileFormatter; import com.Acrobot.ChestShop.Metadata.ItemDatabase; import com.Acrobot.ChestShop.Signs.RestrictedSign; @@ -181,10 +180,6 @@ public class ChestShop extends JavaPlugin { registerEvent(new ShopRefundListener()); registerEvent(new ShortNameSaver()); - - if (!Properties.TURN_OFF_CRAFTBUKKIT_TELEPORTATION_BUGFIX) { - registerEvent(new TeleportFixListener()); - } } private void registerPreShopCreationEvents() { diff --git a/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java b/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java index d95c383..5516bbb 100644 --- a/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java +++ b/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java @@ -152,10 +152,4 @@ public class Properties { @ConfigurationComment("How much Heroes exp should people get for creating a ChestShop?") public static double HEROES_EXP = 100; - - public static byte NEWLINE_HEROES_EXP; /////////////////////////////////////////////////// - - @ConfigurationComment("Do you want to turn off the CraftBukkit teleportation bugfix, which closes the inventory screen on teleport? " + - "(If you're using xAuth, you might want to turn it on) - only applies to CraftBukkit versions lower than 1.4.7-R1.1") - public static boolean TURN_OFF_CRAFTBUKKIT_TELEPORTATION_BUGFIX = false; }