Don't send diff meta while initializing

NiFeather · Dec 15, 2023 · fa2d796 · fa2d796
1 parent f9b6922
commit fa2d796
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...va/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/SingleWatcher.java b/...va/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/SingleWatcher.java
@@ -79,11 +79,13 @@ public SingleWatcher(Player bindingPlayer, EntityType entityType)
         this.bindingUUID = bindingPlayer.getUniqueId();
         this.bindingPlayer = bindingPlayer;
 
+        syncing = true;
         this.entityType = entityType;
         initRegistry();
         initValues();
 
         sync();
+        syncing = false;
     }
 
     //region Custom Registry

diff --git a/...ain/java/xiamomc/morph/backends/server/renderer/network/listeners/MetaPacketListener.java b/...ain/java/xiamomc/morph/backends/server/renderer/network/listeners/MetaPacketListener.java
@@ -50,8 +50,14 @@ private void onMetaPacket(ClientboundSetEntityDataPacket packet, PacketEvent pac
         if (targetPlayer == sourcePlayer)
             return;
 
-        //取得来源玩家的伪装后的Meta，发送给目标玩家
-        packetEvent.setPacket(getFactory().buildFullMetaPacket(sourcePlayer, watcher));
+        //不要二次处理来自我们自己的包
+        var packetContainer = packetEvent.getPacket();
+        var meta = packetContainer.getMeta(PacketFactory.MORPH_PACKET_METAKEY);
+        if (meta.isEmpty())
+        {
+            //取得来源玩家的伪装后的Meta，发送给目标玩家
+            packetEvent.setPacket(getFactory().buildFullMetaPacket(sourcePlayer, watcher));
+        }
     }
 
     @Override