Remove timings for third-party session handlers

Reverted MR #1717

Author: Joo200

config/checkstyle/import-control.xml

@@ -31,7 +31,6 @@
       <allow pkg="io.papermc.lib"/>
       <allow pkg="com.destroystokyo.paper"/>
       <allow pkg="io.papermc.paper"/>
-      <allow pkg="co.aikar.timings.lib" />
       <allow pkg="org.spigotmc" />
     </subpackage>
 

worldguard-bukkit/build.gradle.kts

@@ -12,10 +12,6 @@ repositories {
         name = "paper"
         url = uri("https://repo.papermc.io/repository/maven-public/")
     }
-    maven {
-        name = "aikar-timings"
-        url = uri("https://repo.aikar.co/nexus/content/groups/aikar/")
-    }
 }
 
 configurations {
@@ -33,7 +29,6 @@ dependencies {
     "compileOnly"("com.sk89q:commandbook:2.3") { isTransitive = false }
     "shadeOnly"("io.papermc:paperlib:1.0.8")
     "shadeOnly"("org.bstats:bstats-bukkit:3.0.1")
-    "shadeOnly"("co.aikar:minecraft-timings:1.0.4")
 }
 
 tasks.named<Copy>("processResources") {

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java

@@ -37,7 +37,6 @@ public class BukkitConfigurationManager extends YamlConfigurationManager {
 
     private boolean hasCommandBookGodMode;
     boolean extraStats;
-    boolean timedSessionHandlers;
 
     /**
      * Construct the object.
@@ -57,7 +56,6 @@ public Collection<BukkitWorldConfiguration> getWorldConfigs() {
     public void load() {
         super.load();
         this.extraStats = getConfig().getBoolean("custom-metrics-charts", true);
-        this.timedSessionHandlers = getConfig().getBoolean("extra-timings.session-handlers", true);
     }
 
     @Override

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java

@@ -139,7 +139,6 @@ public void load() {
         sessionManager = new BukkitSessionManager();
         configuration = new BukkitConfigurationManager(WorldGuardPlugin.inst());
         configuration.load();
-        sessionManager.setUsingTimings(configuration.timedSessionHandlers);
         regionContainer = new BukkitRegionContainer(WorldGuardPlugin.inst());
         regionContainer.initialize();
         debugHandler = new BukkitDebugHandler(WorldGuardPlugin.inst());

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java

@@ -28,7 +28,6 @@
 import com.sk89q.worldguard.bukkit.util.Entities;
 import com.sk89q.worldguard.session.AbstractSessionManager;
 import com.sk89q.worldguard.session.Session;
-import com.sk89q.worldguard.session.handler.Handler;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -42,13 +41,6 @@
  */
 public class BukkitSessionManager extends AbstractSessionManager implements Runnable, Listener {
 
-    private boolean useTimings;
-
-    @Override
-    protected Handler.Factory<? extends Handler> wrapForRegistration(Handler.Factory<? extends Handler> factory) {
-        return useTimings ? new TimedHandlerFactory(factory) : factory;
-    }
-
     /**
      * Re-initialize handlers and clear "last position," "last state," etc.
      * information for all players.
@@ -94,14 +86,6 @@ public boolean hasBypass(LocalPlayer player, World world) {
         return super.hasBypass(player, world);
     }
 
-    public boolean isUsingTimings() {
-        return useTimings;
-    }
-
-    public void setUsingTimings(boolean useTimings) {
-        this.useTimings = useTimings;
-    }
-
     public void shutdown() {
         for (Player player : Bukkit.getServer().getOnlinePlayers()) {
             LocalPlayer localPlayer = WorldGuardPlugin.inst().wrapPlayer(player);

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/session/TimedHandlerFactory.java

@@ -44,10 +44,8 @@
 import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiPredicate;
@@ -75,8 +73,6 @@ public abstract class AbstractSessionManager implements SessionManager {
                     createSession(key.playerRef.get())));
 
     private boolean hasCustom = false;
-    // <original handler, wrapped handler>
-    private Map<Handler.Factory<? extends Handler>, Handler.Factory<? extends Handler>> wrappedHandlers = new HashMap<>();
     private List<Handler.Factory<? extends Handler>> handlers = new LinkedList<>();
 
     private static final List<Handler.Factory<? extends Handler>> defaultHandlers = new LinkedList<>();
@@ -110,27 +106,20 @@ public boolean customHandlersRegistered() {
         return hasCustom;
     }
 
-    protected Handler.Factory<? extends Handler> wrapForRegistration(Handler.Factory<? extends Handler> factory) {
-        return factory;
-    }
-
     @Override
     public boolean registerHandler(Handler.Factory<? extends Handler> factory, @Nullable Handler.Factory<? extends Handler> after) {
         if (factory == null) return false;
         WorldGuard.logger.log(Level.INFO, "Registering session handler "
                 + factory.getClass().getEnclosingClass().getName());
         hasCustom = true;
-        Handler.Factory<? extends Handler> wrappedFactory = wrapForRegistration(factory);
         if (after == null) {
-            handlers.add(wrappedFactory);
+            handlers.add(factory);
         } else {
-            Handler.Factory<? extends Handler> wrappedAfter = wrappedHandlers.get(after);
-            int index = handlers.indexOf(wrappedAfter != null ? wrappedAfter : after);
+            int index = handlers.indexOf(after);
             if (index == -1) return false;
 
             handlers.add(index + 1, factory); // shifts "after" right one, and everything after "after" right one
         }
-        wrappedHandlers.put(factory, wrappedFactory);
         return true;
     }
 
@@ -142,7 +131,6 @@ public boolean unregisterHandler(Handler.Factory<? extends Handler> factory) {
         } else {
             WorldGuard.logger.log(Level.INFO, "Unregistering session handler "
                     + factory.getClass().getEnclosingClass().getName());
-            factory = wrappedHandlers.remove(factory);
         }
         return handlers.remove(factory);
     }

worldguard-core/src/main/java/com/sk89q/worldguard/session/AbstractSessionManager.java

@@ -34,10 +34,10 @@
 import com.sk89q.worldguard.session.handler.Handler;
 import com.sk89q.worldguard.util.Locations;
 
+import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nullable;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -69,7 +69,7 @@ public Session(SessionManager manager) {
      * @param handler A new handler
      */
     public void register(Handler handler) {
-        handlers.put(handler.getWrappedHandler().getClass(), handler);
+        handlers.put(handler.getClass(), handler);
     }
 
     /**
@@ -91,7 +91,7 @@ public SessionManager getManager() {
     @Nullable
     @SuppressWarnings("unchecked")
     public <T extends Handler> T getHandler(Class<T> type) {
-        return (T) handlers.get(type).getWrappedHandler();
+        return (T) handlers.get(type);
     }
 
     /**

worldguard-core/src/main/java/com/sk89q/worldguard/session/Session.java

@@ -148,11 +148,4 @@ public State getInvincibility(LocalPlayer player) {
         return null;
     }
 
-    /**
-     * Get the handler wrapped by this handler object, if applicable, or just return this if no handler is wrapped.
-     * @return any wrapped handler, or this handler itself
-     */
-    public Handler getWrappedHandler() {
-        return this;
-    }
 }