Fix horse saddle handling in 1.21.5->1.21.4

Author: kennytv

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/BlockItemPacketRewriter1_21_5.java

@@ -91,7 +91,7 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
     private static final int SIGN_BOCK_ENTITY_ID = 7;
     private static final int HANGING_SIGN_BOCK_ENTITY_ID = 8;
     private static final int SADDLE_EQUIPMENT_SLOT = 7;
-    private static final byte SADDLED_FLAG = 4;
+    static final byte SADDLED_FLAG = 4;
 
     public BlockItemPacketRewriter1_21_5(final Protocol1_21_5To1_21_4 protocol) {
         super(protocol);
@@ -187,7 +187,8 @@ public void registerPackets() {
                 final int equipmentSlot = value & 0x7F;
                 if (equipmentSlot == SADDLE_EQUIPMENT_SLOT) {
                     if (trackedEntity != null && trackedEntity.entityType().isOrHasParent(EntityTypes1_21_5.ABSTRACT_HORSE)) {
-                        sendSaddledEntityData(wrapper.user(), trackedEntity, entityId);
+                        final Item item = wrapper.read(itemType());
+                        sendSaddledEntityData(wrapper.user(), trackedEntity, entityId, item.identifier() == 800);
                     }
                     wrapper.cancel();
                     return;
@@ -268,16 +269,24 @@ private void convertClientAsset(final PacketWrapper wrapper) {
         wrapper.write(Types.STRING, namespace + ":textures/" + path + ".png");
     }
 
-    private void sendSaddledEntityData(final UserConnection connection, final TrackedEntity trackedEntity, final int entityId) {
+    private void sendSaddledEntityData(final UserConnection connection, final TrackedEntity trackedEntity, final int entityId, final boolean saddled) {
         byte data = 0;
         if (trackedEntity.hasData()) {
             final HorseDataStorage horseDataStorage = trackedEntity.data().get(HorseDataStorage.class);
             if (horseDataStorage != null) {
+                if (horseDataStorage.saddled() == saddled) {
+                    return;
+                }
+
                 data = horseDataStorage.data();
             }
         }
-        trackedEntity.data().put(new HorseDataStorage(data, true));
-        data = (byte) (data | SADDLED_FLAG);
+
+        trackedEntity.data().put(new HorseDataStorage(data, saddled));
+
+        if (saddled) {
+            data = (byte) (data | SADDLED_FLAG);
+        }
 
         final PacketWrapper entityDataPacket = PacketWrapper.create(ClientboundPackets1_21_2.SET_ENTITY_DATA, connection);
         final List<EntityData> entityDataList = new ArrayList<>();

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/rewriter/EntityPacketRewriter1_21_5.java

@@ -306,16 +306,18 @@ protected void registerRewrites() {
         }));
 
         filter().type(EntityTypes1_21_5.ABSTRACT_HORSE).index(17).handler((event, data) -> {
-            // Store data for later
+            // Store data and set saddled flag if needed
             final TrackedEntity entity = event.trackedEntity();
-            if (entity.hasData()) {
-                final HorseDataStorage horseDataStorage = entity.data().get(HorseDataStorage.class);
-                if (horseDataStorage != null && horseDataStorage.saddled()) {
-                    entity.data().put(new HorseDataStorage(data.value(), true));
-                    return;
-                }
+            final byte horseData = data.value();
+            boolean saddled = false;
+
+            final HorseDataStorage horseDataStorage;
+            if (entity.hasData() && (horseDataStorage = entity.data().get(HorseDataStorage.class)) != null && horseDataStorage.saddled()) {
+                saddled = true;
+                data.setValue((byte) (horseData | BlockItemPacketRewriter1_21_5.SADDLED_FLAG));
             }
-            entity.data().put(new HorseDataStorage(data.value(), false));
+
+            entity.data().put(new HorseDataStorage(horseData, saddled));
         });
 
         filter().type(EntityTypes1_21_5.CHICKEN).cancel(17); // Chicken variant