diff --git a/gradle.properties b/gradle.properties index 7c186ed..dbfd51e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.21.1-R0.1-SNAPSHOT mcVersion=1.21.1 -paperRef=25621248d3f30f35c3458b4b13a2474ffd0bee0e +paperRef=227c94ae21634e3cba5992ac29bb2b258f039067 org.gradle.caching=false org.gradle.parallel=true diff --git a/patches/server/0067-Reduce-array-allocations.patch b/patches/server/0067-Reduce-array-allocations.patch index 3bade31..ce32cd1 100644 --- a/patches/server/0067-Reduce-array-allocations.patch +++ b/patches/server/0067-Reduce-array-allocations.patch @@ -364,18 +364,18 @@ index 20b5a81d50397438b3200322f31b62db44ebdb3b..c80be65d190c85e7f0ea8233ebbbdbc1 for (int j = 0; j < i; ++j) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 423d4bb88501f462e3d5761f45c3dbee64930d50..f4b7ac0d9571daf751196e342016601dbd2f2787 100644 +index 93095ecefe3ce2209664e442b50a596cd0e7b0d4..6e010409af3856eb742e786669811f1f7ea217d8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2816,7 +2816,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl entity.refreshEntityData(ServerGamePacketListenerImpl.this.player); // SPIGOT-7136 - Allays - if (entity instanceof Allay) { + if (entity instanceof Allay || entity instanceof net.minecraft.world.entity.animal.horse.AbstractHorse) { // Paper - Fix horse armor desync - ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList()), true)); // Paper - sanitize + ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.VALUES).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList()), true)); // Paper - sanitize // Gale - JettPack - reduce array allocations - ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); } - } + + ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - fix slot desync - always refresh player inventory diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java index 22865e638a50397d194fb39b883f73753de1f7f0..a60651bb5e1156db2b3ccd74e18661aa3f19b9c2 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java diff --git a/patches/server/0101-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0101-Broadcast-crit-animations-as-the-entity-being-critte.patch index 0571c7b..622cdf0 100644 --- a/patches/server/0101-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/patches/server/0101-Broadcast-crit-animations-as-the-entity-being-critte.patch @@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4854f3ccb643a0f0487dbbe84dc2b7f7eeb9c627..e27d7439d48be96696082085dc0f0bbcdb056f5a 100644 +index 978aa293c771c065a435d564e4355c837678a92b..61e2fc796d49fe45229a1b0cd630355ab7d59883 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2148,12 +2148,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -2152,12 +2152,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @Override public void crit(Entity target) { diff --git a/patches/server/0120-Add-xor-shift-random.patch b/patches/server/0120-Add-xor-shift-random.patch index 02c87e9..772bfb4 100644 --- a/patches/server/0120-Add-xor-shift-random.patch +++ b/patches/server/0120-Add-xor-shift-random.patch @@ -53,7 +53,7 @@ index 67103310c59bcf7bd6e873d97a4c88a032d9f999..4aa33233060b2b2bd809d92d35bd0933 // CraftBukkit start diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index eb0389ad86300665b6e057bcfa1d7c068dc6c6ab..6d864396f72220d9c92733a38ff6f2fd235238f5 100644 +index 1e0439cf3f4008fa430acb90b45f5bc4cdd6d7f2..b0ef7d56d736353722dcb92442a43c07be290cf1 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -109,7 +109,7 @@ public class RegionFile implements AutoCloseable { @@ -66,10 +66,10 @@ index eb0389ad86300665b6e057bcfa1d7c068dc6c6ab..6d864396f72220d9c92733a38ff6f2fd } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ffd284f0e25c6f20672f7225aafd37e6c87ccf03..9738a27e9f7168a4a67d195f209f343d4ad5afc6 100644 +index 90d4834f97d3ba996d46493246b1947511553424..f4a2086f54f183e72d9f1923b6313016a9e08d0a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -246,7 +246,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -256,7 +256,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { } // Paper end