From f579681e099e308044db9c9c0d4dfb04c792876a Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sun, 22 Dec 2024 01:07:54 +0100 Subject: [PATCH] Update to 1.21.4 --- ...ments.patch => 1077-SW-WallBlock-Cache-Improvements.patch} | 0 ...bug-Messages.patch => 1078-SW-Remove-Debug-Messages.patch} | 2 +- ...locks-cache.patch => 1079-SW-optimized-Blocks-cache.patch} | 4 ++-- ...e-Caches.patch => 1080-SW-Remove-or-Optimize-Caches.patch} | 0 ...-Disable-Commands.patch => 1081-SW-Disable-Commands.patch} | 2 +- ...emove-World-Lock.patch => 1082-SW-Remove-World-Lock.patch} | 0 ...Symlink-Check.patch => 1083-SW-Remove-Symlink-Check.patch} | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename patches/server/{1073-SW-WallBlock-Cache-Improvements.patch => 1077-SW-WallBlock-Cache-Improvements.patch} (100%) rename patches/server/{1074-SW-Remove-Debug-Messages.patch => 1078-SW-Remove-Debug-Messages.patch} (98%) rename patches/server/{1075-SW-optimized-Blocks-cache.patch => 1079-SW-optimized-Blocks-cache.patch} (90%) rename patches/server/{1076-SW-Remove-or-Optimize-Caches.patch => 1080-SW-Remove-or-Optimize-Caches.patch} (100%) rename patches/server/{1077-SW-Disable-Commands.patch => 1081-SW-Disable-Commands.patch} (98%) rename patches/server/{1078-SW-Remove-World-Lock.patch => 1082-SW-Remove-World-Lock.patch} (100%) rename patches/server/{1079-SW-Remove-Symlink-Check.patch => 1083-SW-Remove-Symlink-Check.patch} (100%) diff --git a/patches/server/1073-SW-WallBlock-Cache-Improvements.patch b/patches/server/1077-SW-WallBlock-Cache-Improvements.patch similarity index 100% rename from patches/server/1073-SW-WallBlock-Cache-Improvements.patch rename to patches/server/1077-SW-WallBlock-Cache-Improvements.patch diff --git a/patches/server/1074-SW-Remove-Debug-Messages.patch b/patches/server/1078-SW-Remove-Debug-Messages.patch similarity index 98% rename from patches/server/1074-SW-Remove-Debug-Messages.patch rename to patches/server/1078-SW-Remove-Debug-Messages.patch index e251a4fd43..8787d7b4bf 100644 --- a/patches/server/1074-SW-Remove-Debug-Messages.patch +++ b/patches/server/1078-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 ac8af406180bc680d46e8edc3da0fc2e5211345a..63752016506cd84bad39eaec14a7756bf06f608b 100644 +index 97b5d6ba2b19a7c730730c74175a29157aed1840..121a92ad18f32fe816c2d1863789e6cb5930b116 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -517,7 +517,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/1075-SW-optimized-Blocks-cache.patch b/patches/server/1079-SW-optimized-Blocks-cache.patch similarity index 90% rename from patches/server/1075-SW-optimized-Blocks-cache.patch rename to patches/server/1079-SW-optimized-Blocks-cache.patch index ba5eae7b5d..d1eb4e78ea 100644 --- a/patches/server/1075-SW-optimized-Blocks-cache.patch +++ b/patches/server/1079-SW-optimized-Blocks-cache.patch @@ -5,7 +5,7 @@ Subject: [PATCH] SW optimized Blocks cache 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 99fd67a78539133adf78d65e2c520ff3dd260301..0f077ce5b3ce5a5c9fa149a9bce6035070eb98dd 100644 +index 8c0f332a1a0918f60226d969918ae7fe4fe74166..d517b90a8c471867ae981a6dea46213a2b492c17 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 @@ -81,6 +81,7 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; @@ -16,7 +16,7 @@ index 99fd67a78539133adf78d65e2c520ff3dd260301..0f077ce5b3ce5a5c9fa149a9bce60350 import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -@@ -1469,7 +1470,7 @@ public abstract class BlockBehaviour implements FeatureElement { +@@ -1477,7 +1478,7 @@ public abstract class BlockBehaviour implements FeatureElement { } } diff --git a/patches/server/1076-SW-Remove-or-Optimize-Caches.patch b/patches/server/1080-SW-Remove-or-Optimize-Caches.patch similarity index 100% rename from patches/server/1076-SW-Remove-or-Optimize-Caches.patch rename to patches/server/1080-SW-Remove-or-Optimize-Caches.patch diff --git a/patches/server/1077-SW-Disable-Commands.patch b/patches/server/1081-SW-Disable-Commands.patch similarity index 98% rename from patches/server/1077-SW-Disable-Commands.patch rename to patches/server/1081-SW-Disable-Commands.patch index de7fa350fc..942323870a 100644 --- a/patches/server/1077-SW-Disable-Commands.patch +++ b/patches/server/1081-SW-Disable-Commands.patch @@ -5,7 +5,7 @@ Subject: [PATCH] SW Disable Commands diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index 260350422fc724ba5cd5769cbb387b6007f36a84..c6e6203053b5f693f20417864a1dce33cbf8352d 100644 +index 517cb238ec280aadd1fc54bcb675ed386e798eaf..43989f8c386436ba18bff96d34861fcc4b8e3aec 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -160,66 +160,66 @@ public class Commands { diff --git a/patches/server/1078-SW-Remove-World-Lock.patch b/patches/server/1082-SW-Remove-World-Lock.patch similarity index 100% rename from patches/server/1078-SW-Remove-World-Lock.patch rename to patches/server/1082-SW-Remove-World-Lock.patch diff --git a/patches/server/1079-SW-Remove-Symlink-Check.patch b/patches/server/1083-SW-Remove-Symlink-Check.patch similarity index 100% rename from patches/server/1079-SW-Remove-Symlink-Check.patch rename to patches/server/1083-SW-Remove-Symlink-Check.patch