fix some client desync

Closes #13729

Author: Lulu13022002

paper-server/patches/sources/net/minecraft/network/syncher/SynchedEntityData.java.patch

@@ -5,8 +5,8 @@
      }
 
 +    // CraftBukkit start - add method from above
-+    public <T> void markDirty(final EntityDataAccessor<T> entityDataAccessor) {
-+        this.getItem(entityDataAccessor).setDirty(true);
++    public <T> void markDirty(final EntityDataAccessor<T> accessor) {
++        this.getItem(accessor).setDirty(true);
 +        this.isDirty = true;
 +    }
 +    // CraftBukkit end
@@ -23,12 +23,12 @@
 +    // We need to pack all as we cannot rely on "non default values" or "dirty" ones.
 +    // Because these values can possibly be desynced on the client.
 +    public List<SynchedEntityData.DataValue<?>> packAll() {
-+        final List<SynchedEntityData.DataValue<?>> list = new ArrayList<>(this.itemsById.length);
-+        for (final DataItem<?> dataItem : this.itemsById) {
-+            list.add(dataItem.value());
++        final List<SynchedEntityData.DataValue<?>> items = new ArrayList<>(this.itemsById.length);
++        for (final DataItem<?> item : this.itemsById) {
++            items.add(item.value());
 +        }
 +
-+        return list;
++        return items;
 +    }
 +    // Paper end
 

paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -240,10 +240,10 @@
 +    // Paper start
 +    // This method should only be used if the data of an entity could have become desynced
 +    // due to interactions on the client.
-+    public void resendPossiblyDesyncedEntityData(net.minecraft.server.level.ServerPlayer player) {
++    public void resendPossiblyDesyncedEntityData(ServerPlayer player) {
 +        if (player.getBukkitEntity().canSee(this.getBukkitEntity())) {
-+            ServerLevel world = (net.minecraft.server.level.ServerLevel)this.level();
-+            net.minecraft.server.level.ChunkMap.TrackedEntity tracker = world == null ? null : world.getChunkSource().chunkMap.entityMap.get(this.getId());
++            ServerLevel level = (net.minecraft.server.level.ServerLevel) this.level();
++            net.minecraft.server.level.ChunkMap.TrackedEntity tracker = level == null ? null : level.getChunkSource().chunkMap.entityMap.get(this.getId());
 +            if (tracker == null) {
 +                return;
 +            }
@@ -254,16 +254,16 @@
 +        }
 +    }
 +
-+    // This method allows you to specifically resend certain data accessor keys to the client
-+    public void resendPossiblyDesyncedDataValues(List<EntityDataAccessor<?>> keys, ServerPlayer to) {
++    // This method allows you to specifically resend certain data accessors to the client
++    public void resendPossiblyDesyncedDataValues(List<EntityDataAccessor<?>> accessors, ServerPlayer to) {
 +        if (!to.getBukkitEntity().canSee(this.getBukkitEntity())) {
 +            return;
 +        }
 +
-+        final List<SynchedEntityData.DataValue<?>> values = new java.util.ArrayList<>(keys.size());
-+        for (final EntityDataAccessor<?> key : keys) {
-+            final SynchedEntityData.DataItem<?> synchedValue = this.entityData.getItem(key);
-+            values.add(synchedValue.value());
++        final List<SynchedEntityData.DataValue<?>> values = new ArrayList<>(accessors.size());
++        for (final EntityDataAccessor<?> accessor : accessors) {
++            final SynchedEntityData.DataItem<?> item = this.entityData.getItem(accessor);
++            values.add(item.value());
 +        }
 +
 +        to.connection.send(new net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket(this.id, values));
@@ -1329,7 +1329,7 @@
      }
 
      public int getAirSupply() {
-@@ -2732,10 +_,22 @@
+@@ -2732,10 +_,24 @@
      }
 
      public void setAirSupply(final int supply) {
@@ -1341,7 +1341,9 @@
 +            event.getEntity().getServer().getPluginManager().callEvent(event);
 +        }
 +        if (event.isCancelled() && this.getAirSupply() != supply) {
-+            this.entityData.markDirty(DATA_AIR_SUPPLY_ID);
++            if (this instanceof ServerPlayer player) {
++                this.resendPossiblyDesyncedDataValues(java.util.List.of(DATA_AIR_SUPPLY_ID), player); // todo is that even needed?
++            }
 +            return;
 +        }
 +        this.entityData.set(DATA_AIR_SUPPLY_ID, event.getAmount());

paper-server/patches/sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch

@@ -48,13 +48,19 @@
                      return InteractionResult.SUCCESS.withoutItem();
                  }
 
-@@ -486,6 +_,13 @@
+@@ -486,6 +_,19 @@
 
              DyeColor color = itemStack.get(DataComponents.DYE);
              if (color != null && color != this.getCollarColor()) {
 +                // Paper start - Add EntityDyeEvent and CollarColorable interface
 +                final io.papermc.paper.event.entity.EntityDyeEvent event = new io.papermc.paper.event.entity.EntityDyeEvent(this.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData((byte) color.getId()), (org.bukkit.entity.Player) player.getBukkitEntity());
 +                if (!event.callEvent()) {
++                    if (player instanceof net.minecraft.server.level.ServerPlayer serverPlayer) {
++                        this.resendPossiblyDesyncedDataValues(java.util.List.of(DATA_COLLAR_COLOR), serverPlayer);
++                    }
++                    if (!player.hasInfiniteMaterials()) {
++                        player.containerMenu.forceHeldSlot(hand);
++                    }
 +                    return InteractionResult.FAIL;
 +                }
 +                color = DyeColor.byId(event.getColor().getWoolData());