fix rejoin lost some properties

NiFeather · Dec 14, 2023 · 479faa0 · 479faa0
1 parent 0af906f
commit 479faa0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/xiamomc/morph/backends/server/ServerBackend.java b/src/main/java/xiamomc/morph/backends/server/ServerBackend.java
@@ -140,8 +140,10 @@ public boolean isDisguised(@org.jetbrains.annotations.Nullable Entity target)
     @Override
     public boolean disguise(Player player, DisguiseWrapper<?> wrapper)
     {
+        logger.info("Incoming wrapper is " + wrapper);
         if (!(wrapper instanceof ServerDisguiseWrapper serverDisguiseWrapper)) return false;
-        if (disguiseWrapperMap.containsKey(player.getUniqueId())) return false;
+        if (disguiseWrapperMap.containsKey(player.getUniqueId()))
+            unDisguise(player);
 
         disguiseWrapperMap.put(player.getUniqueId(), serverDisguiseWrapper);
 

diff --git a/src/main/java/xiamomc/morph/backends/server/ServerDisguiseWrapper.java b/src/main/java/xiamomc/morph/backends/server/ServerDisguiseWrapper.java
@@ -24,6 +24,7 @@
 import xiamomc.morph.misc.DisguiseState;
 import xiamomc.morph.utilities.NbtUtils;
 
+import java.util.Objects;
 import java.util.UUID;
 
 public class ServerDisguiseWrapper extends DisguiseWrapper<ServerDisguise>
@@ -155,7 +156,17 @@ public ServerDisguise copyInstance()
     @Override
     public DisguiseWrapper<ServerDisguise> clone()
     {
-        return new ServerDisguiseWrapper(this.copyInstance(), (ServerBackend) getBackend());
+        var newInstance = new ServerDisguiseWrapper(this.copyInstance(), (ServerBackend) getBackend());
+        newInstance.mergeCompound(this.getCompound());
+
+        newInstance.shouldDisplayCustomEquipment = this.shouldDisplayCustomEquipment;
+        newInstance.setFakeEquipments(this.equipment);
+
+        newInstance.armorStandShowArms = this.armorStandShowArms;
+        newInstance.armorStandSmall = this.armorStandSmall;
+        newInstance.armorStandNoBasePlate = this.armorStandNoBasePlate;
+
+        return newInstance;
     }
 
     /**
@@ -303,8 +314,10 @@ public Player getBindingPlayer()
 
     private SingleWatcher bindingWatcher;
 
-    public void setRenderParameters(Player newBinding, SingleWatcher bindingWatcher)
+    public void setRenderParameters(@NotNull Player newBinding, @NotNull SingleWatcher bindingWatcher)
     {
+        Objects.requireNonNull(bindingWatcher, "Null Watcher!");
+
         bindingPlayer = newBinding;
         this.bindingWatcher = bindingWatcher;