From 0e2564c3fadb360ed18e7803c525b78cd7a4bdd1 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 24 Sep 2023 17:01:28 -0500 Subject: [PATCH] Rebuild patches --- ...0033-Limit-sculk-catalyst-cursor-positions.patch} | 0 ...event-player-banning-using-duplicate-UUIDs.patch} | 6 +++--- ... 0035-Don-t-warn-on-duplicate-entity-UUIDs.patch} | 4 ++-- ...36-Fix-component-extra-empty-array-exploit.patch} | 2 +- ...-Add-depth-limit-to-Component-deserializer.patch} | 2 +- ...tch => 0038-Implement-command-block-events.patch} | 10 +++++----- ...SNBT.patch => 0039-Add-depth-limit-to-SNBT.patch} | 12 ++++++------ ...nge.patch => 0040-Limit-beacon-effectRange.patch} | 6 +++--- ...41-Improve-validation-of-ResourceLocations.patch} | 0 ...0042-Don-t-log-on-too-many-chained-updates.patch} | 2 +- ...ch => 0043-Fix-packet-related-lag-exploits.patch} | 10 +++++----- ...=> 0044-Limit-save-data-for-Bees-and-Vexes.patch} | 2 +- ...utes.patch => 0045-Mute-invalid-attributes.patch} | 8 ++++---- ...ch => 0046-Mute-invalid-Enderdragon-phases.patch} | 0 ... 0047-Add-length-limit-to-note-block-sound.patch} | 4 ++-- 15 files changed, 34 insertions(+), 34 deletions(-) rename patches/server/{0038-Limit-sculk-catalyst-cursor-positions.patch => 0033-Limit-sculk-catalyst-cursor-positions.patch} (100%) rename patches/server/{0040-Prevent-player-banning-using-duplicate-UUIDs.patch => 0034-Prevent-player-banning-using-duplicate-UUIDs.patch} (84%) rename patches/server/{0041-Don-t-warn-on-duplicate-entity-UUIDs.patch => 0035-Don-t-warn-on-duplicate-entity-UUIDs.patch} (86%) rename patches/server/{0042-Fix-component-extra-empty-array-exploit.patch => 0036-Fix-component-extra-empty-array-exploit.patch} (91%) rename patches/server/{0043-Add-depth-limit-to-Component-deserializer.patch => 0037-Add-depth-limit-to-Component-deserializer.patch} (98%) rename patches/server/{0044-Implement-command-block-events.patch => 0038-Implement-command-block-events.patch} (91%) rename patches/server/{0045-Add-depth-limit-to-SNBT.patch => 0039-Add-depth-limit-to-SNBT.patch} (91%) rename patches/server/{0046-Limit-beacon-effectRange.patch => 0040-Limit-beacon-effectRange.patch} (83%) rename patches/server/{0047-Improve-validation-of-ResourceLocations.patch => 0041-Improve-validation-of-ResourceLocations.patch} (100%) rename patches/server/{0048-Don-t-log-on-too-many-chained-updates.patch => 0042-Don-t-log-on-too-many-chained-updates.patch} (90%) rename patches/server/{0049-Fix-packet-related-lag-exploits.patch => 0043-Fix-packet-related-lag-exploits.patch} (85%) rename patches/server/{0050-Limit-save-data-for-Bees-and-Vexes.patch => 0044-Limit-save-data-for-Bees-and-Vexes.patch} (96%) rename patches/server/{0051-Mute-invalid-attributes.patch => 0045-Mute-invalid-attributes.patch} (84%) rename patches/server/{0052-Mute-invalid-Enderdragon-phases.patch => 0046-Mute-invalid-Enderdragon-phases.patch} (100%) rename patches/server/{0054-Add-length-limit-to-note-block-sound.patch => 0047-Add-length-limit-to-note-block-sound.patch} (85%) diff --git a/patches/server/0038-Limit-sculk-catalyst-cursor-positions.patch b/patches/server/0033-Limit-sculk-catalyst-cursor-positions.patch similarity index 100% rename from patches/server/0038-Limit-sculk-catalyst-cursor-positions.patch rename to patches/server/0033-Limit-sculk-catalyst-cursor-positions.patch diff --git a/patches/server/0040-Prevent-player-banning-using-duplicate-UUIDs.patch b/patches/server/0034-Prevent-player-banning-using-duplicate-UUIDs.patch similarity index 84% rename from patches/server/0040-Prevent-player-banning-using-duplicate-UUIDs.patch rename to patches/server/0034-Prevent-player-banning-using-duplicate-UUIDs.patch index b184817..bc6ffac 100644 --- a/patches/server/0040-Prevent-player-banning-using-duplicate-UUIDs.patch +++ b/patches/server/0034-Prevent-player-banning-using-duplicate-UUIDs.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Prevent player banning using duplicate UUIDs diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 18aac3da3c88f33b1a71a5920a8daa27e9723913..b1bfb12f10d6fec9ca905498b4a6768997867311 100644 +index 868951dc21aff541765b1f58f08cdf3c47446d25..f714b076dcaa78cb8a666ce2e9f24c66d6af0989 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1610,7 +1610,13 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1643,7 +1643,13 @@ public class ServerLevel extends Level implements WorldGenLevel { if (entity != null) { - ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID().toString()); + ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID()); entity.unRide(); - this.removePlayerImmediately((ServerPlayer) entity, Entity.RemovalReason.DISCARDED); + // Scissors start - Prevent player banning using duplicate UUIDs diff --git a/patches/server/0041-Don-t-warn-on-duplicate-entity-UUIDs.patch b/patches/server/0035-Don-t-warn-on-duplicate-entity-UUIDs.patch similarity index 86% rename from patches/server/0041-Don-t-warn-on-duplicate-entity-UUIDs.patch rename to patches/server/0035-Don-t-warn-on-duplicate-entity-UUIDs.patch index 1014f85..aa2254e 100644 --- a/patches/server/0041-Don-t-warn-on-duplicate-entity-UUIDs.patch +++ b/patches/server/0035-Don-t-warn-on-duplicate-entity-UUIDs.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't warn on duplicate entity UUIDs diff --git a/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java -index 41791c7331c80d496cde4e3d1846a178bef0bbe3..d04181bda85dbaa77d3b55b04b25519496bec4ff 100644 +index c4d1dbbd39ba0cdc9176ffa6d350d2aa50380211..0059a67d168f448085a8a2b983bdd24944cb0cee 100644 --- a/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java +++ b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java -@@ -372,7 +372,7 @@ public final class EntityLookup implements LevelEntityGetter { +@@ -407,7 +407,7 @@ public final class EntityLookup implements LevelEntityGetter { return false; } if (this.entityByUUID.containsKey(entity.getUUID())) { diff --git a/patches/server/0042-Fix-component-extra-empty-array-exploit.patch b/patches/server/0036-Fix-component-extra-empty-array-exploit.patch similarity index 91% rename from patches/server/0042-Fix-component-extra-empty-array-exploit.patch rename to patches/server/0036-Fix-component-extra-empty-array-exploit.patch index b506470..df0a0c3 100644 --- a/patches/server/0042-Fix-component-extra-empty-array-exploit.patch +++ b/patches/server/0036-Fix-component-extra-empty-array-exploit.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix component extra empty array exploit diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java -index 2873ed7c443ed8c8c57a8b1d3e444d229f10f07b..a2149452ee461002ea74189c5aa49cddd943d0cf 100644 +index 9cb6fa8e35c89f73e7c95dbe219a4bf6d00b60a9..fa6151a2361684426bdd3bf3b433fe4dbd0cf47b 100644 --- a/src/main/java/net/minecraft/network/chat/Component.java +++ b/src/main/java/net/minecraft/network/chat/Component.java @@ -266,6 +266,7 @@ public interface Component extends Message, FormattedText, Iterable { diff --git a/patches/server/0043-Add-depth-limit-to-Component-deserializer.patch b/patches/server/0037-Add-depth-limit-to-Component-deserializer.patch similarity index 98% rename from patches/server/0043-Add-depth-limit-to-Component-deserializer.patch rename to patches/server/0037-Add-depth-limit-to-Component-deserializer.patch index c05b2a1..c8d87de 100644 --- a/patches/server/0043-Add-depth-limit-to-Component-deserializer.patch +++ b/patches/server/0037-Add-depth-limit-to-Component-deserializer.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add depth limit to Component deserializer diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java -index a2149452ee461002ea74189c5aa49cddd943d0cf..f1d1501211a923c0ccab6b5982887c3a9262889b 100644 +index fa6151a2361684426bdd3bf3b433fe4dbd0cf47b..4dd93e02f2b18e5c75be14ff8f052220ca69f427 100644 --- a/src/main/java/net/minecraft/network/chat/Component.java +++ b/src/main/java/net/minecraft/network/chat/Component.java @@ -26,6 +26,7 @@ import java.util.List; diff --git a/patches/server/0044-Implement-command-block-events.patch b/patches/server/0038-Implement-command-block-events.patch similarity index 91% rename from patches/server/0044-Implement-command-block-events.patch rename to patches/server/0038-Implement-command-block-events.patch index cb22ef3..51e013d 100644 --- a/patches/server/0044-Implement-command-block-events.patch +++ b/patches/server/0038-Implement-command-block-events.patch @@ -18,7 +18,7 @@ index c99fc118013cb3d4043638e2001a8297e79ddf9c..cdaa81e1f2167b29ec01cc25e51a8400 private final boolean trackOutput; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 08390409bbaf9f3ae8260ab36ea5e0580e93b3e3..e2f7cef0edf2775083eb87b1cb5984ec8b25c76f 100644 +index ad87d90de1679955cb5a9d1c925be7d281cc64c9..b4213a2f0f8c57b606b1a1a993d352bda200bd63 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1,6 +1,8 @@ @@ -30,7 +30,7 @@ index 08390409bbaf9f3ae8260ab36ea5e0580e93b3e3..e2f7cef0edf2775083eb87b1cb5984ec import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors import com.google.common.collect.Lists; import com.google.common.primitives.Floats; -@@ -159,6 +161,7 @@ import net.minecraft.world.entity.player.Inventory; +@@ -155,6 +157,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.ProfilePublicKey; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.vehicle.Boat; @@ -38,7 +38,7 @@ index 08390409bbaf9f3ae8260ab36ea5e0580e93b3e3..e2f7cef0edf2775083eb87b1cb5984ec import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.Item; -@@ -187,6 +190,8 @@ import net.minecraft.world.phys.Vec3; +@@ -182,6 +185,8 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.BooleanOp; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; @@ -47,7 +47,7 @@ index 08390409bbaf9f3ae8260ab36ea5e0580e93b3e3..e2f7cef0edf2775083eb87b1cb5984ec import org.slf4j.Logger; // CraftBukkit start -@@ -1007,6 +1012,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -893,6 +898,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.player.level().getChunkAt(blockposition).setBlockEntity(tileentity); } @@ -64,7 +64,7 @@ index 08390409bbaf9f3ae8260ab36ea5e0580e93b3e3..e2f7cef0edf2775083eb87b1cb5984ec commandblocklistenerabstract.setCommand(s); commandblocklistenerabstract.setTrackOutput(flag); if (!flag) { -@@ -1038,7 +1053,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -924,7 +939,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl BaseCommandBlock commandblocklistenerabstract = packet.getCommandBlock(this.player.level()); if (commandblocklistenerabstract != null) { diff --git a/patches/server/0045-Add-depth-limit-to-SNBT.patch b/patches/server/0039-Add-depth-limit-to-SNBT.patch similarity index 91% rename from patches/server/0045-Add-depth-limit-to-SNBT.patch rename to patches/server/0039-Add-depth-limit-to-SNBT.patch index 1120102..dd5f315 100644 --- a/patches/server/0045-Add-depth-limit-to-SNBT.patch +++ b/patches/server/0039-Add-depth-limit-to-SNBT.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add depth limit to SNBT diff --git a/src/main/java/net/minecraft/nbt/TagParser.java b/src/main/java/net/minecraft/nbt/TagParser.java -index fbfe810e8be6cb159742f7fd85e7491b9cefa4dc..b70bafe2766efcbcce00287e6511a588560564a6 100644 +index ee012f1ef1ff7f2adf76d1690dbd5611af7deb4d..d79723047317c24c53fb85c423de8dd9f84891ac 100644 --- a/src/main/java/net/minecraft/nbt/TagParser.java +++ b/src/main/java/net/minecraft/nbt/TagParser.java -@@ -169,9 +169,56 @@ public class TagParser { +@@ -179,9 +179,56 @@ public class TagParser { } this.expect('}'); @@ -66,7 +66,7 @@ index fbfe810e8be6cb159742f7fd85e7491b9cefa4dc..b70bafe2766efcbcce00287e6511a588 private Tag readListTag() throws CommandSyntaxException { this.expect('['); this.reader.skipWhitespace(); -@@ -203,7 +250,7 @@ public class TagParser { +@@ -213,7 +260,7 @@ public class TagParser { } this.expect(']'); @@ -75,7 +75,7 @@ index fbfe810e8be6cb159742f7fd85e7491b9cefa4dc..b70bafe2766efcbcce00287e6511a588 } } -@@ -228,7 +275,7 @@ public class TagParser { +@@ -238,7 +285,7 @@ public class TagParser { } private List readArray(TagType arrayTypeReader, TagType typeReader) throws CommandSyntaxException { @@ -84,7 +84,7 @@ index fbfe810e8be6cb159742f7fd85e7491b9cefa4dc..b70bafe2766efcbcce00287e6511a588 while(true) { if (this.reader.peek() != ']') { -@@ -241,11 +288,11 @@ public class TagParser { +@@ -251,11 +298,11 @@ public class TagParser { } if (typeReader == ByteTag.TYPE) { @@ -99,7 +99,7 @@ index fbfe810e8be6cb159742f7fd85e7491b9cefa4dc..b70bafe2766efcbcce00287e6511a588 } if (this.hasElementSeparator()) { -@@ -257,7 +304,7 @@ public class TagParser { +@@ -267,7 +314,7 @@ public class TagParser { } this.expect(']'); diff --git a/patches/server/0046-Limit-beacon-effectRange.patch b/patches/server/0040-Limit-beacon-effectRange.patch similarity index 83% rename from patches/server/0046-Limit-beacon-effectRange.patch rename to patches/server/0040-Limit-beacon-effectRange.patch index a273b57..46ad5b9 100644 --- a/patches/server/0046-Limit-beacon-effectRange.patch +++ b/patches/server/0040-Limit-beacon-effectRange.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Limit beacon effectRange diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index 5c951ef93fe4cf4f085df86b0cefc02bc2610ab9..1d08e3a9493154e075a289d2eb9a8772289534af 100644 +index f13943db6f2fb923c52dcf9e8bf7000041d0a362..2fdcc47dd6a813d5f7a32dc58ca67b6b965c8749 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -@@ -83,7 +83,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name +@@ -87,7 +87,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name private double effectRange = -1; public double getEffectRange() { @@ -17,7 +17,7 @@ index 5c951ef93fe4cf4f085df86b0cefc02bc2610ab9..1d08e3a9493154e075a289d2eb9a8772 return this.levels * 10 + 10; } else { return effectRange; -@@ -428,6 +428,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name +@@ -456,6 +456,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name this.lockKey = LockCode.fromTag(nbt); this.effectRange = nbt.contains(PAPER_RANGE_TAG, 6) ? nbt.getDouble(PAPER_RANGE_TAG) : -1; // Paper diff --git a/patches/server/0047-Improve-validation-of-ResourceLocations.patch b/patches/server/0041-Improve-validation-of-ResourceLocations.patch similarity index 100% rename from patches/server/0047-Improve-validation-of-ResourceLocations.patch rename to patches/server/0041-Improve-validation-of-ResourceLocations.patch diff --git a/patches/server/0048-Don-t-log-on-too-many-chained-updates.patch b/patches/server/0042-Don-t-log-on-too-many-chained-updates.patch similarity index 90% rename from patches/server/0048-Don-t-log-on-too-many-chained-updates.patch rename to patches/server/0042-Don-t-log-on-too-many-chained-updates.patch index e4fc6de..51e1ab4 100644 --- a/patches/server/0048-Don-t-log-on-too-many-chained-updates.patch +++ b/patches/server/0042-Don-t-log-on-too-many-chained-updates.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't log on too many chained updates diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java -index ec81be70cd6f92bbf9011395cb361f0ce54c5ad0..97da1db83dca24759b52fc2d0a360187dbef86f1 100644 +index 598dc0d3a2b9387e76d7e4e19e54c4573a24bc54..9eed28bf8bc7e2fa528729cde01a535bc7040815 100644 --- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java +++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java @@ -56,7 +56,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater { diff --git a/patches/server/0049-Fix-packet-related-lag-exploits.patch b/patches/server/0043-Fix-packet-related-lag-exploits.patch similarity index 85% rename from patches/server/0049-Fix-packet-related-lag-exploits.patch rename to patches/server/0043-Fix-packet-related-lag-exploits.patch index 9f76e4f..9da32d6 100644 --- a/patches/server/0049-Fix-packet-related-lag-exploits.patch +++ b/patches/server/0043-Fix-packet-related-lag-exploits.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix packet-related lag exploits diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e2f7cef0edf2775083eb87b1cb5984ec8b25c76f..c645e05ec6c309448460c7e983931b9dc79a7f7e 100644 +index b4213a2f0f8c57b606b1a1a993d352bda200bd63..957c1ec2b6ae60c5de5960a13a2900762b6ffb61 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -972,7 +972,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -858,7 +858,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.player.sendSystemMessage(Component.translatable("advMode.notEnabled")); } else if (!this.player.canUseGameMasterBlocks() && (!this.player.isCreative() || !this.player.getBukkitEntity().hasPermission("minecraft.commandblock"))) { // Paper - command block permission this.player.sendSystemMessage(Component.translatable("advMode.notAllowed")); @@ -17,7 +17,7 @@ index e2f7cef0edf2775083eb87b1cb5984ec8b25c76f..c645e05ec6c309448460c7e983931b9d BaseCommandBlock commandblocklistenerabstract = null; CommandBlockEntity tileentitycommand = null; BlockPos blockposition = packet.getPos(); -@@ -1139,7 +1139,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1025,7 +1025,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void handleSetStructureBlock(ServerboundSetStructureBlockPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); @@ -26,7 +26,7 @@ index e2f7cef0edf2775083eb87b1cb5984ec8b25c76f..c645e05ec6c309448460c7e983931b9d BlockPos blockposition = packet.getPos(); BlockState iblockdata = this.player.level().getBlockState(blockposition); BlockEntity tileentity = this.player.level().getBlockEntity(blockposition); -@@ -1197,7 +1197,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1083,7 +1083,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void handleSetJigsawBlock(ServerboundSetJigsawBlockPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); @@ -35,7 +35,7 @@ index e2f7cef0edf2775083eb87b1cb5984ec8b25c76f..c645e05ec6c309448460c7e983931b9d BlockPos blockposition = packet.getPos(); BlockState iblockdata = this.player.level().getBlockState(blockposition); BlockEntity tileentity = this.player.level().getBlockEntity(blockposition); -@@ -1220,7 +1220,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1106,7 +1106,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void handleJigsawGenerate(ServerboundJigsawGeneratePacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); diff --git a/patches/server/0050-Limit-save-data-for-Bees-and-Vexes.patch b/patches/server/0044-Limit-save-data-for-Bees-and-Vexes.patch similarity index 96% rename from patches/server/0050-Limit-save-data-for-Bees-and-Vexes.patch rename to patches/server/0044-Limit-save-data-for-Bees-and-Vexes.patch index 022bf2b..2ffec9d 100644 --- a/patches/server/0050-Limit-save-data-for-Bees-and-Vexes.patch +++ b/patches/server/0044-Limit-save-data-for-Bees-and-Vexes.patch @@ -24,7 +24,7 @@ index 55026e1731e41b4e3e4c6a8fef5d96a32051a556..4a8383d48da4fcf39ec528a00cd09417 this.savedFlowerPos = null; diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java -index 65cb385ab294e362d666a6d03c4496cdc3b64890..42c3e946e51f6dcb100078969a4fb46c77f42b2d 100644 +index 90e577b1a89b02c38daff2845a63dafe5ed929e1..1a2b6ee032ab6952634c9f596820db3e7374fb50 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java @@ -118,8 +118,12 @@ public class Vex extends Monster implements TraceableEntity { diff --git a/patches/server/0051-Mute-invalid-attributes.patch b/patches/server/0045-Mute-invalid-attributes.patch similarity index 84% rename from patches/server/0051-Mute-invalid-attributes.patch rename to patches/server/0045-Mute-invalid-attributes.patch index 15899dd..0da0a1c 100644 --- a/patches/server/0051-Mute-invalid-attributes.patch +++ b/patches/server/0045-Mute-invalid-attributes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Mute invalid attributes diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java -index dd1102d5291ef6f18e82400a6d8a0a376cc071e9..d304612325d6c70a4100582d6c0fbfeecd8716d1 100644 +index 7204b973c3ad9239e82355513f6d538107102e48..2463444778f19f937b18173798c04d9d9788a824 100644 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java -@@ -145,7 +145,7 @@ public class AttributeMap { +@@ -147,7 +147,7 @@ public class AttributeMap { } }, () -> { @@ -18,10 +18,10 @@ index dd1102d5291ef6f18e82400a6d8a0a376cc071e9..d304612325d6c70a4100582d6c0fbfee } diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeModifier.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeModifier.java -index 8de09eea46c27db9d8c472e84f768976769d1b0b..c8d05d35368e0cf593bcc3589b6c108a901bdc22 100644 +index a7380ce6dcbf64ad8a51dd047d178ae887518041..cb015941e5ea4618bd0964f4aa66a9f0fceb27a1 100644 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeModifier.java +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeModifier.java -@@ -90,7 +90,7 @@ public class AttributeModifier { +@@ -92,7 +92,7 @@ public class AttributeModifier { AttributeModifier.Operation operation = AttributeModifier.Operation.fromValue(nbt.getInt("Operation")); return new AttributeModifier(uUID, nbt.getString("Name"), nbt.getDouble("Amount"), operation); } catch (Exception var3) { diff --git a/patches/server/0052-Mute-invalid-Enderdragon-phases.patch b/patches/server/0046-Mute-invalid-Enderdragon-phases.patch similarity index 100% rename from patches/server/0052-Mute-invalid-Enderdragon-phases.patch rename to patches/server/0046-Mute-invalid-Enderdragon-phases.patch diff --git a/patches/server/0054-Add-length-limit-to-note-block-sound.patch b/patches/server/0047-Add-length-limit-to-note-block-sound.patch similarity index 85% rename from patches/server/0054-Add-length-limit-to-note-block-sound.patch rename to patches/server/0047-Add-length-limit-to-note-block-sound.patch index 46c6329..161c66c 100644 --- a/patches/server/0054-Add-length-limit-to-note-block-sound.patch +++ b/patches/server/0047-Add-length-limit-to-note-block-sound.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add length limit to note block sound diff --git a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java -index a2fc2c0437999dd09f080eafe8ea466b16cdf57b..0dcf1d7e041477fe31dce4b4ee707399520d30f2 100644 +index 238b6cd88cb24ca63770db607f2241fcd7210574..ec02597810a4022112ddf31928eb6976e6ac5371 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java -@@ -80,7 +80,7 @@ public class SkullBlockEntity extends BlockEntity { +@@ -92,7 +92,7 @@ public class SkullBlockEntity extends BlockEntity { } if (nbt.contains("note_block_sound", 8)) {