From 037a909005693b794a2d49afdcd18c8840437d76 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Tue, 27 Aug 2024 13:57:27 +0200 Subject: [PATCH] Update to 1.21.1 --- ...nts.patch => 1046-SW-WallBlock-Cache-Improvements.patch} | 0 ...g-Messages.patch => 1047-SW-Remove-Debug-Messages.patch} | 2 +- ...ble.patch => 1048-SW-Use-optimized-NeighbourTable.patch} | 0 ...cks-cache.patch => 1049-SW-optimized-Blocks-cache.patch} | 6 +++--- ...Caches.patch => 1050-SW-Remove-or-Optimize-Caches.patch} | 0 ...isable-Commands.patch => 1051-SW-Disable-Commands.patch} | 0 ...ove-World-Lock.patch => 1052-SW-Remove-World-Lock.patch} | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename patches/server/{1047-SW-WallBlock-Cache-Improvements.patch => 1046-SW-WallBlock-Cache-Improvements.patch} (100%) rename patches/server/{1048-SW-Remove-Debug-Messages.patch => 1047-SW-Remove-Debug-Messages.patch} (98%) rename patches/server/{1049-SW-Use-optimized-NeighbourTable.patch => 1048-SW-Use-optimized-NeighbourTable.patch} (100%) rename patches/server/{1050-SW-optimized-Blocks-cache.patch => 1049-SW-optimized-Blocks-cache.patch} (92%) rename patches/server/{1051-SW-Remove-or-Optimize-Caches.patch => 1050-SW-Remove-or-Optimize-Caches.patch} (100%) rename patches/server/{1052-SW-Disable-Commands.patch => 1051-SW-Disable-Commands.patch} (100%) rename patches/server/{1053-SW-Remove-World-Lock.patch => 1052-SW-Remove-World-Lock.patch} (100%) diff --git a/patches/server/1047-SW-WallBlock-Cache-Improvements.patch b/patches/server/1046-SW-WallBlock-Cache-Improvements.patch similarity index 100% rename from patches/server/1047-SW-WallBlock-Cache-Improvements.patch rename to patches/server/1046-SW-WallBlock-Cache-Improvements.patch diff --git a/patches/server/1048-SW-Remove-Debug-Messages.patch b/patches/server/1047-SW-Remove-Debug-Messages.patch similarity index 98% rename from patches/server/1048-SW-Remove-Debug-Messages.patch rename to patches/server/1047-SW-Remove-Debug-Messages.patch index 1e0c6f9c94..dac96c5ac9 100644 --- a/patches/server/1048-SW-Remove-Debug-Messages.patch +++ b/patches/server/1047-SW-Remove-Debug-Messages.patch @@ -76,7 +76,7 @@ index c038da20b76c0b7b1c18471b20be01e849d29f3a..f5611bf250aaa2851ca8873291c7f4b6 try { StoredUserList.GSON.toJson(jsonarray, StoredUserList.GSON.newJsonWriter(bufferedwriter)); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c8b82bc41f2042bb4b067f06265a3a22e51f7629..e7f63e2f9271b05748db152be43ce9dfad6ff3a5 100644 +index f6de1c6e8fd9086b7bd725f75ee2606583591d6a..18e552458b29e79e01e4372cd8ccd2d0556de99e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -502,7 +502,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/1049-SW-Use-optimized-NeighbourTable.patch b/patches/server/1048-SW-Use-optimized-NeighbourTable.patch similarity index 100% rename from patches/server/1049-SW-Use-optimized-NeighbourTable.patch rename to patches/server/1048-SW-Use-optimized-NeighbourTable.patch diff --git a/patches/server/1050-SW-optimized-Blocks-cache.patch b/patches/server/1049-SW-optimized-Blocks-cache.patch similarity index 92% rename from patches/server/1050-SW-optimized-Blocks-cache.patch rename to patches/server/1049-SW-optimized-Blocks-cache.patch index 71bc89f6da..db2cffdb6a 100644 --- a/patches/server/1050-SW-optimized-Blocks-cache.patch +++ b/patches/server/1049-SW-optimized-Blocks-cache.patch @@ -41,10 +41,10 @@ index 223259e7a09ada681b6181c898f6857888594f85..3f31a3115c69fd976ccb1e396018d94b } } diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index ded6d148110fe3fbb6272ce44582a28472dd49a6..16fe0554f38665cd652eef8fe693371c5de4542a 100644 +index d0109633e8bdf109cfc9178963d7b6cf92f8b189..ea142873eaeb6cd0ebf4eb65a7ed582cfe80c709 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -@@ -77,6 +77,7 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; +@@ -78,6 +78,7 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; @@ -52,7 +52,7 @@ index ded6d148110fe3fbb6272ce44582a28472dd49a6..16fe0554f38665cd652eef8fe693371c import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -@@ -1435,7 +1436,7 @@ public abstract class BlockBehaviour implements FeatureElement { +@@ -1436,7 +1437,7 @@ public abstract class BlockBehaviour implements FeatureElement { } } diff --git a/patches/server/1051-SW-Remove-or-Optimize-Caches.patch b/patches/server/1050-SW-Remove-or-Optimize-Caches.patch similarity index 100% rename from patches/server/1051-SW-Remove-or-Optimize-Caches.patch rename to patches/server/1050-SW-Remove-or-Optimize-Caches.patch diff --git a/patches/server/1052-SW-Disable-Commands.patch b/patches/server/1051-SW-Disable-Commands.patch similarity index 100% rename from patches/server/1052-SW-Disable-Commands.patch rename to patches/server/1051-SW-Disable-Commands.patch diff --git a/patches/server/1053-SW-Remove-World-Lock.patch b/patches/server/1052-SW-Remove-World-Lock.patch similarity index 100% rename from patches/server/1053-SW-Remove-World-Lock.patch rename to patches/server/1052-SW-Remove-World-Lock.patch