Fix #45: equipment changes should not be run when sending pairing changes

PureGero · PureGero · commit 2832f2eb60a9 · 2026-02-18T16:33:28.000+09:00
diff --git a/shreddedpaper-server/minecraft-patches/sources/net/minecraft/server/level/ServerEntity.java.patch b/shreddedpaper-server/minecraft-patches/sources/net/minecraft/server/level/ServerEntity.java.patch
@@ -16,3 +16,12 @@
                  }
              }
  
+@@ -352,7 +_,7 @@
+             if (!list.isEmpty()) {
+                 consumer.accept(new ClientboundSetEquipmentPacket(this.entity.getId(), list, true)); // Paper - data sanitization
+             }
+-            ((LivingEntity) this.entity).detectEquipmentUpdates(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
++            // ((LivingEntity) this.entity).detectEquipmentUpdates(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending // ShreddedPaper - why? - equipment changes should not be run when sending pairing changes
+         }
+ 
+         if (!this.entity.getPassengers().isEmpty()) {

Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,12 @@`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
	`19`	`+@@ -352,7 +_,7 @@`
	`20`	`+ if (!list.isEmpty()) {`
	`21`	`+ consumer.accept(new ClientboundSetEquipmentPacket(this.entity.getId(), list, true)); // Paper - data sanitization`
	`22`	`+ }`
	`23`	`+- ((LivingEntity) this.entity).detectEquipmentUpdates(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending`
	`24`	`++ // ((LivingEntity) this.entity).detectEquipmentUpdates(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending // ShreddedPaper - why? - equipment changes should not be run when sending pairing changes`
	`25`	`+ }`
	`26`	`+`
	`27`	`+ if (!this.entity.getPassengers().isEmpty()) {`