[lifecycle events] fix prepare world hook for old server versions

OrnitheMC · Jan 24, 2025 · 44ad22a · 44ad22a
1 parent a1b7461
commit 44ad22a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/..._02/src/main/java/net/ornithemc/osl/lifecycle/impl/mixin/server/MinecraftServerMixin.java b/..._02/src/main/java/net/ornithemc/osl/lifecycle/impl/mixin/server/MinecraftServerMixin.java
@@ -85,9 +85,8 @@ public class MinecraftServerMixin {
 		method = "loadWorld",
 		at = @At(
 			value = "INVOKE",
-			remap = false,
-			ordinal = 0,
-			target = "Ljava/lang/System;currentTimeMillis()J"
+			shift = Shift.AFTER,
+			target = "Lnet/minecraft/server/PlayerManager;setWorld(Lnet/minecraft/server/world/ServerWorld;)V"
 		)
 	)
 	private void osl$lifecycle$prepareWorld(CallbackInfo ci) {

diff --git a/...2.8/src/main/java/net/ornithemc/osl/lifecycle/impl/mixin/server/MinecraftServerMixin.java b/...2.8/src/main/java/net/ornithemc/osl/lifecycle/impl/mixin/server/MinecraftServerMixin.java
@@ -85,9 +85,8 @@ public class MinecraftServerMixin {
 		method = "loadWorld",
 		at = @At(
 			value = "INVOKE",
-			remap = false,
-			ordinal = 0,
-			target = "Ljava/lang/System;currentTimeMillis()J"
+			shift = Shift.AFTER,
+			target = "Lnet/minecraft/server/PlayerManager;setWorld(Lnet/minecraft/server/world/ServerWorld;)V"
 		)
 	)
 	private void osl$lifecycle$prepareWorld(CallbackInfo ci) {