Merge branch '1.21.4' into 1.21.1

NiFeather · Jan 23, 2025 · f02368d · f02368d
2 parents ce7a88f + 34a94cb
commit f02368d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 50 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ minecraft_version=1.21.1-R0.1-SNAPSHOT
 # Dependencies
 protocollib_version=5.3.0
 #ld_version=10.0.33
-pluginbase_version=f19aea37
+pluginbase_version=f88301fa8f
 gsit_version=1.6.0
 papi_version=2.11.5
 bstats_version=3.0.2

diff --git a/src/main/java/xyz/nifeather/morph/FeatherMorphMain.java b/src/main/java/xyz/nifeather/morph/FeatherMorphMain.java
@@ -268,55 +268,6 @@ protected void enable()
         IconLookup.instance();
     }
 
-    @Override
-    protected void tick()
-    {
-        currentTick += 1;
-
-        if (cancelSchedules) return;
-
-        List<ScheduleInfo> schedulesTemp;
-
-        synchronized (schedules)
-        {
-            schedulesTemp = new ObjectArrayList<>(this.schedules.size());
-            schedulesTemp.addAll(this.schedules);
-        }
-
-        schedulesTemp.forEach(c ->
-        {
-            if (c == null)
-            {
-                if (doInternalDebugOutput)
-                    logger.warn("Trying to execute a NULL ScheduleInfo?! This shouldn't happen!");
-
-                return;
-            }
-
-            if (c.isCanceled())
-            {
-                this.schedules.remove(c);
-                return;
-            }
-
-            if (currentTick - c.TickScheduled >= c.Delay)
-            {
-                this.schedules.remove(c);
-
-                //Allows us to cancel half-way
-                if (cancelSchedules) return;
-
-                //logger.info("执行：" + c + "，当前TICK：" + currentTick);\
-                if (c.isAsync)
-                    runAsync(() -> runFunction(c));
-                else
-                    runFunction(c);
-            }
-        });
-
-        schedulesTemp.clear();
-    }
-
     @Override
     public void disable()
     {