Fix

voruti · Dec 1, 2023 · 20dae3a · 20dae3a
1 parent 8423586
commit 20dae3a
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/main/java/one/oktw/mixin/bungee/ServerLoginNetworkHandlerMixin.java b/src/main/java/one/oktw/mixin/bungee/ServerLoginNetworkHandlerMixin.java
@@ -6,14 +6,11 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerLoginNetworkHandler;
 import one.oktw.interfaces.BungeeClientConnection;
-import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerLoginNetworkHandler.class)
 public abstract class ServerLoginNetworkHandlerMixin {
@@ -26,18 +23,19 @@ public abstract class ServerLoginNetworkHandlerMixin {
     private GameProfile profile;
 
 
-    @Inject(method = "onHello", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD,
-            target = "Lnet/minecraft/server/network/ServerLoginNetworkHandler;profile:Lcom/mojang/authlib/GameProfile;",
-            shift = At.Shift.AFTER))
-    private void initUuid(CallbackInfo ci) {
+    @Redirect(method = "onHello", at = @At(value = "INVOKE",
+            target = "Lnet/minecraft/server/MinecraftServer;getHostProfile()Lcom/mojang/authlib/GameProfile;"))
+    private GameProfile initUuid(MinecraftServer minecraftServer) {
         // override game profile with saved information:
-        this.profile = new GameProfile(((BungeeClientConnection) connection).getSpoofedUUID(), this.profile.getName());
+        final GameProfile gameProfile = new GameProfile(((BungeeClientConnection) connection).getSpoofedUUID(), this.profile.getName());
 
         if (((BungeeClientConnection) connection).getSpoofedProfile() != null) {
             for (Property property : ((BungeeClientConnection) connection).getSpoofedProfile()) {
                 this.profile.getProperties().put(property.name(), property);
             }
         }
+
+        return gameProfile;
     }
 
     @Redirect(method = "onHello", at = @At(value = "INVOKE",