🐛 修复fakePlayerUseOfflinePlayerUUID导致的无法召唤假人的问题

Minecraft-AMS · Sep 21, 2024 · d3963ce · d3963ce
1 parent c8b72e5
commit d3963ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...cams/carpet/mixin/rule/fakePlayerUseOfflinePlayerUuid/Carpet_EntityPlayerMPFakeMixin.java b/...cams/carpet/mixin/rule/fakePlayerUseOfflinePlayerUuid/Carpet_EntityPlayerMPFakeMixin.java
@@ -26,6 +26,7 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+
 import com.mojang.authlib.GameProfile;
 
 //#if MC>=11900
@@ -49,14 +50,14 @@ public abstract class Carpet_EntityPlayerMPFakeMixin {
             target = "Lnet/minecraft/util/UserCache;findByName(Ljava/lang/String;)Ljava/util/Optional;"
         )
     )
-    private static Optional<GameProfile> useOfflinePlayerUuid(UserCache userCache, String playerName, Operation<GameProfile> original) {
+    private static Optional<GameProfile> useOfflinePlayerUUID(UserCache userCache, String playerName, Operation<Optional<GameProfile>> original) {
         return
             AmsServerSettings.fakePlayerUseOfflinePlayerUUID ?
             //#if MC>=11900
             //$$ Optional.of(new GameProfile(Uuids.getOfflinePlayerUuid(playerName), playerName)) :
             //#else
             Optional.of(new GameProfile(PlayerEntity.getOfflinePlayerUuid(playerName), playerName)) :
             //#endif
-            Optional.of(original.call(userCache, playerName));
+            original.call(userCache, playerName);
     }
 }
diff --git a/...lub/mcams/carpet/mixin/rule/fakePlayerUseOfflinePlayerUuid/Carpet_PlayerCommandMixin.java b/...lub/mcams/carpet/mixin/rule/fakePlayerUseOfflinePlayerUuid/Carpet_PlayerCommandMixin.java
@@ -26,6 +26,7 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+
 import com.mojang.authlib.GameProfile;
 
 //#if MC>=11900
@@ -49,7 +50,7 @@ public abstract class Carpet_PlayerCommandMixin {
             target = "Lnet/minecraft/util/UserCache;findByName(Ljava/lang/String;)Ljava/util/Optional;"
         )
     )
-    private static Optional<GameProfile> useOfflinePlayerUuid(UserCache userCache, String playerName, Operation<Optional<GameProfile>> original) {
+    private static Optional<GameProfile> useOfflinePlayerUUID(UserCache userCache, String playerName, Operation<Optional<GameProfile>> original) {
         return
             AmsServerSettings.fakePlayerUseOfflinePlayerUUID ?
             //#if MC>=11900