Sync "Sitting" nbt

nyuppo · Apr 19, 2024 · 34d1bda · 34d1bda
1 parent 4c2a5e6
commit 34d1bda
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/com/github/nyuppo/MoreMobVariants.java b/src/main/java/com/github/nyuppo/MoreMobVariants.java
@@ -14,6 +14,7 @@
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.entity.passive.PigEntity;
 import net.minecraft.entity.passive.SheepEntity;
+import net.minecraft.entity.passive.TameableEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.registry.RegistryKeys;
@@ -89,6 +90,11 @@ public void onInitialize() {
                     responseBuf.writeInt(entity.getId());
                     responseBuf.writeString(nbt.getString(NBT_KEY));
 
+                    // For some reason, "Sitting" syncing breaks, so send that too I guess
+                    if (entity instanceof TameableEntity) {
+                        responseBuf.writeBoolean(nbt.getBoolean("Sitting"));
+                    }
+
                     // Muddy pigs
                     if (entity instanceof PigEntity) {
                         responseBuf.writeBoolean(nbt.getBoolean(MUDDY_NBT_KEY));

diff --git a/src/main/java/com/github/nyuppo/MoreMobVariantsClient.java b/src/main/java/com/github/nyuppo/MoreMobVariantsClient.java
@@ -19,6 +19,7 @@
 import net.minecraft.entity.passive.CatEntity;
 import net.minecraft.entity.passive.PigEntity;
 import net.minecraft.entity.passive.SheepEntity;
+import net.minecraft.entity.passive.TameableEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.PacketByteBuf;
 import org.slf4j.Logger;
@@ -65,6 +66,11 @@ public void onInitializeClient() {
 
                     nbt.putString(MoreMobVariants.NBT_KEY, variantId);
 
+                    // For some reason, "Sitting" syncing breaks, so get that too I guess
+                    if (entity instanceof TameableEntity) {
+                        nbt.putBoolean("Sitting", buf.readBoolean());
+                    }
+
                     // Muddy pigs
                     boolean isMuddy;
                     int muddyTimeLeft;