diff --git a/eSpigot-Server/src/main/java/net/minecraft/server/MinecraftServer.java b/eSpigot-Server/src/main/java/net/minecraft/server/MinecraftServer.java
index cd2767d..b1bdd16 100644
--- a/eSpigot-Server/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/eSpigot-Server/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -890,22 +890,15 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
         this.h[this.ticks % 100] = System.nanoTime() - i;
         this.methodProfiler.b();
 
-        /* this.methodProfiler.a("snooper");
-        if (getSnooperEnabled() && !this.n.d() && this.ticks > 100) {  // Spigot
-            this.n.a();
-        }
-
-        if (getSnooperEnabled() && this.ticks % 6000 == 0) { // Spigot
-            this.n.b();
-        }
-
-        this.methodProfiler.b(); */
 
         this.methodProfiler.b();
         org.spigotmc.WatchdogThread.tick(); // Spigot
         co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Spigot
     }
 
+    public static List<Runnable> PRE_ENTITY_TRACKER_RUNNABLE_LIST = new ArrayList<>();
+    public static List<Runnable> POST_ENTITY_TRACKER_RUNNABLE_LIST = new ArrayList<>();
+
     public void B() {
         SpigotTimings.minecraftSchedulerTimer.startTiming(); // Spigot
         this.methodProfiler.a("jobs");
@@ -1006,7 +999,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                     }
                 }
                 try {
+                    PRE_ENTITY_TRACKER_RUNNABLE_LIST.forEach(Runnable::run);
                     worldserver.getTracker().updatePlayers();
+                    POST_ENTITY_TRACKER_RUNNABLE_LIST.forEach(Runnable::run);
                 } finally {
                     for (NetworkManager networkManager : disabledFlushes)
                         networkManager.enableAutomaticFlush();