Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java

src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java

@@ -14,6 +14,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.function.BooleanSupplier;
 
+import static carpet.script.CarpetEventServer.Event.ENDER_TICK;
+import static carpet.script.CarpetEventServer.Event.NETHER_TICK;
+import static carpet.script.CarpetEventServer.Event.TICK;
+
 @Mixin(MinecraftServer.class)
 public abstract class MinecraftServer_scarpetMixin extends NonBlockingThreadExecutor<ServerTask> implements MinecraftServerInterface
 {
@@ -44,6 +48,8 @@ public abstract class MinecraftServer_scarpetMixin extends NonBlockingThreadExec
     ))
     public void tickTasks(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     {
-        CarpetServer.scriptServer.events.onTick();
+        TICK.onTick();
+        NETHER_TICK.onTick();
+        ENDER_TICK.onTick();
     }
 }