diff --git a/build.gradle.kts b/build.gradle.kts index 1714f81..9e0a0b5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG plugins { java id("com.github.johnrengelman.shadow") version "8.1.1" apply false - id("io.papermc.paperweight.patcher") version "1.5.11" + id("io.papermc.paperweight.patcher") version "1.5.15" } repositories { @@ -14,8 +14,8 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.8.10:fat") - decompiler("net.minecraftforge:forgeflower:2.0.627.2") + remapper("net.fabricmc:tiny-remapper:0.10.1:fat") + decompiler("org.vineflower:vineflower:1.10.1") paperclip("io.papermc:paperclip:3.0.3") } diff --git a/gradle.properties b/gradle.properties index 5d10409..197a324 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.samsuik.sakura version=1.20.4-R0.1-SNAPSHOT mcVersion=1.20.4 -paperRef=6ad63fba30e7ecd1b11bb8d77e8ed43f0a6e9ce9 +paperRef=f4c7d373e4a1aff23539fe099745bf29a28559b9 org.gradle.jvmargs=-Xmx2G diff --git a/patches/server/0001-Branding-changes.patch b/patches/server/0001-Branding-changes.patch index 7c78776..5dac94e 100644 --- a/patches/server/0001-Branding-changes.patch +++ b/patches/server/0001-Branding-changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Branding changes From ForkPaper. diff --git a/build.gradle.kts b/build.gradle.kts -index 241808d8619e17c0681f79acbbc98af5bf52dd89..e75d8907b9a28e882fdc6531a456f76782965bb0 100644 +index bcfe59b6efb628ee1e7f9d60667360d4d885fb6a..08745682d6543ce8f06f5a9f94016e2f04b89177 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -34,10 +34,10 @@ index 241808d8619e17c0681f79acbbc98af5bf52dd89..e75d8907b9a28e882fdc6531a456f767 "Specification-Title" to "Bukkit", "Specification-Version" to project.version, diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d06185566b447c432d4dc2e3ba04d121bcdbc71b..27134af410284f734abe29d834906f7e51cf05ea 100644 +index 2dc07e5ef249636e85ad9c78e3729e9e066a8fe8..e4ef4306d93cb81868468b78b98fc4c6b7633103 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1855,7 +1855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Fri, 15 Oct 2021 18:32:13 +0100 -Subject: [PATCH] MC-Dev-Fixes - - -diff --git a/src/main/java/net/minecraft/tags/TagKey.java b/src/main/java/net/minecraft/tags/TagKey.java -index 3899e39ef9c602cbe33c71e85af76e72d8938219..b385f7cf774a81d90319e7eb5838a52929c330fb 100644 ---- a/src/main/java/net/minecraft/tags/TagKey.java -+++ b/src/main/java/net/minecraft/tags/TagKey.java -@@ -31,7 +31,7 @@ public record TagKey(ResourceKey> registry, ResourceLoc - } - - public static TagKey create(ResourceKey> registry, ResourceLocation id) { -- return VALUES.intern(new TagKey<>(registry, id)); -+ return (TagKey) VALUES.intern(new TagKey<>(registry, id)); // Sakura - compile error - } - - public boolean isFor(ResourceKey> registryRef) { -@@ -39,7 +39,7 @@ public record TagKey(ResourceKey> registry, ResourceLoc - } - - public Optional> cast(ResourceKey> registryRef) { -- return this.isFor(registryRef) ? Optional.of(this) : Optional.empty(); -+ return this.isFor(registryRef) ? Optional.of((TagKey) this) : Optional.empty(); // Sakura - compile error - } - - @Override -diff --git a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java -index 50a9f33aa31e9273c7c52d4bb2b02f0f884f7ba5..5fb7573022c5af775b2e737dcd05c53cd9ae39ec 100644 ---- a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java -+++ b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java -@@ -61,7 +61,7 @@ public class ClassInstanceMultiMap extends AbstractCollection { - List list = this.byClass.computeIfAbsent(type, (typeClass) -> { - return this.allInstances.stream().filter(typeClass::isInstance).collect(Collectors.toList()); - }); -- return Collections.unmodifiableCollection(list); -+ return (Collection) Collections.unmodifiableCollection(list); // Sakura - decompile fix - } - } - -diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java -index 9a2de546dc2af2ad4bf5d32ca6583f0e1f3f70d8..1e97f781c8cf1bc182bd802bbed1c19077d23bcd 100644 ---- a/src/main/java/net/minecraft/world/level/block/Blocks.java -+++ b/src/main/java/net/minecraft/world/level/block/Blocks.java -@@ -1215,7 +1215,7 @@ public class Blocks { - } - - private static Boolean ocelotOrParrot(BlockState state, BlockGetter world, BlockPos pos, EntityType type) { -- return (boolean)type == EntityType.OCELOT || type == EntityType.PARROT; -+ return type == EntityType.OCELOT || type == EntityType.PARROT; // Sakura - decompile fix - } - - private static Block bed(DyeColor color) { diff --git a/patches/server/0004-Sakura-Configuration-Files.patch b/patches/server/0003-Sakura-Configuration-Files.patch similarity index 99% rename from patches/server/0004-Sakura-Configuration-Files.patch rename to patches/server/0003-Sakura-Configuration-Files.patch index ca5c67b..6ace25f 100644 --- a/patches/server/0004-Sakura-Configuration-Files.patch +++ b/patches/server/0003-Sakura-Configuration-Files.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Sakura Configuration Files diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java -index c01b4393439838976965823298f12e4762e72eff..1489f7066615bd1e0dfc1dd6d99d240ccc4fd334 100644 +index 218bf89fd7583d6db9f64754c4db8fcce5415bdb..df0da18b38f382a452b1e1489a4f2c332f2f1311 100644 --- a/src/main/java/io/papermc/paper/configuration/Configurations.java +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java @@ -93,7 +93,7 @@ public abstract class Configurations { @@ -17,7 +17,7 @@ index c01b4393439838976965823298f12e4762e72eff..1489f7066615bd1e0dfc1dd6d99d240c return node -> { ObjectMapper.Factory factory = (ObjectMapper.Factory) Objects.requireNonNull(node.options().serializers().get(type)); ObjectMapper.Mutable mutable = (ObjectMapper.Mutable) factory.get(type); -@@ -226,7 +226,7 @@ public abstract class Configurations { +@@ -227,7 +227,7 @@ public abstract class Configurations { .path(worldConfigFile) .build(); final ConfigurationNode worldNode = worldLoader.load(); @@ -925,7 +925,7 @@ index 0000000000000000000000000000000000000000..4024f9738e039ffffd560a07a2210f75 +public record DurableMaterial(int durability, float resistance) { +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 27134af410284f734abe29d834906f7e51cf05ea..eb04fab84e266b11ef4e531cb7ea8504a1e46aac 100644 +index e4ef4306d93cb81868468b78b98fc4c6b7633103..ca9013a7141a4e6b5b45651961dd977929a0756b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop TicketType create(String name, Comparator argumentComparator) { return new TicketType<>(name, argumentComparator, 0L); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a63d1a624df5d84f4e8168cbe075ae3d9bd4ff84..9ee8a871714167c9b71c926a8ad41e0e6bb2d4e3 100644 +index 5fbcdbaf4c0344dc3e8fff7bf31c2b021a0ae6cf..6e217474e7224cc5cc0a9818d39233c6757eca50 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -571,6 +571,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -99,7 +99,7 @@ index a63d1a624df5d84f4e8168cbe075ae3d9bd4ff84..9ee8a871714167c9b71c926a8ad41e0e public boolean mayInteract(Level world, BlockPos pos) { diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -index 4e58a786f4c6a4b441e444c41c910b2cd486ee33..1b8c7da956f43f1bebb3ad73d66a22a55fb0e3f5 100644 +index 91aa2714bae3f8f5d0fb76426b2b8cfc61941f54..aae2093c42d76af5bdb0d4bda3e5ee362a2143e3 100644 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java @@ -75,6 +75,7 @@ public class FallingBlockEntity extends Entity { @@ -123,7 +123,7 @@ index 5aa02f28b6be60688e340099b1637fb0ebfe7aa9..7a5ea7e0ea063eb0355dea89746a0e58 public PrimedTnt(Level world, double x, double y, double z, @Nullable LivingEntity igniter) { diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index 6ec3fc801453fd54c25b642e6fa71c19b463311d..99af90c9f4cd7b2e5e230e97f06e131a722b3f78 100644 +index 465458e8a7dbaf9afb32709a71c7b2620d1e1fd2..27b6baae9ac0feec2f2578540e29da6281593add 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -218,6 +218,17 @@ public class LevelChunk extends ChunkAccess { diff --git a/patches/server/0011-TPS-Graph-Command.patch b/patches/server/0010-TPS-Graph-Command.patch similarity index 97% rename from patches/server/0011-TPS-Graph-Command.patch rename to patches/server/0010-TPS-Graph-Command.patch index eb7c413..b2ddf14 100644 --- a/patches/server/0011-TPS-Graph-Command.patch +++ b/patches/server/0010-TPS-Graph-Command.patch @@ -418,7 +418,7 @@ index 0000000000000000000000000000000000000000..59765bb2f4ca16421027bdd0c3e03d89 + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f6a43cbd45834141e539f87f5bd7240ec3879955..06af35cba1a7b9c11cade2bcd0cc72c4bc28e56f 100644 +index 8e2ee508d2290ace16714ed9927983f29a230304..3c98362624e1b02b6b028db95564254e044c7b0d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1125,6 +1125,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return false; } : this::haveTime); @@ -462,7 +462,7 @@ index 366c0c9b45a819f7f94ebe3e49b8ab7f9edf9ce7..3662c364d0bf04c9d5ef3af84bceb426 public boolean isChunkLoaded(int chunkX, int chunkZ) { ChunkHolder chunk = this.chunkMap.getUpdatingChunkIfPresent(ChunkPos.asLong(chunkX, chunkZ)); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 730ad919eef9e38bbeea7cfd1153065b14f12ceb..7a89e4f70195c62c51bbf1993a0988a9c5706449 100644 +index 5df1d01c52b527ff74778d8e4aa27b3b0b1e7a4b..55e0be135ec084ee7ebe6bc7bb9323519e0cd864 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -193,7 +193,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -475,10 +475,10 @@ index 730ad919eef9e38bbeea7cfd1153065b14f12ceb..7a89e4f70195c62c51bbf1993a0988a9 private final GameEventDispatcher gameEventDispatcher; public boolean noSave; diff --git a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java -index 4cdfc433df67afcd455422e9baf56f167dd712ae..1fcce60790cab6e7b137464ccd87e6782a5ae98c 100644 +index 83a39f900551e39d5af6f17a339a386ddee4feef..22782bbf76dc40d57bd6d59ff59356c07b702d8c 100644 --- a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java +++ b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java -@@ -10,6 +10,12 @@ import net.minecraft.world.entity.Entity; +@@ -11,6 +11,12 @@ import net.minecraft.world.entity.Entity; public class EntityTickList { private final io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet entities = new io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet<>(true); // Paper - rewrite this, always keep this updated - why would we EVER tick an entity that's not ticking? @@ -490,7 +490,7 @@ index 4cdfc433df67afcd455422e9baf56f167dd712ae..1fcce60790cab6e7b137464ccd87e678 + private void ensureActiveIsNotIterated() { // Paper - replace with better logic, do not delay removals - + } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java index 6c260403d91d640da0473a3df56e1c5582459fde..2d2d1eeaeb9e7f36263b8cecc753adf721b96435 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java diff --git a/patches/server/0012-Optimise-New-Liquid-Level.patch b/patches/server/0011-Optimise-New-Liquid-Level.patch similarity index 100% rename from patches/server/0012-Optimise-New-Liquid-Level.patch rename to patches/server/0011-Optimise-New-Liquid-Level.patch diff --git a/patches/server/0013-Slice-Packet-obfuscation-and-reduction.patch b/patches/server/0012-Slice-Packet-obfuscation-and-reduction.patch similarity index 98% rename from patches/server/0013-Slice-Packet-obfuscation-and-reduction.patch rename to patches/server/0012-Slice-Packet-obfuscation-and-reduction.patch index 8213dab..4db4f25 100644 --- a/patches/server/0013-Slice-Packet-obfuscation-and-reduction.patch +++ b/patches/server/0012-Slice-Packet-obfuscation-and-reduction.patch @@ -203,7 +203,7 @@ index cce8f45c15b9a9acfbf9b769f7670cfd0969d62f..4237442c649845ffb0ff613e6c76ca47 if (this.entity instanceof LivingEntity) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9ee8a871714167c9b71c926a8ad41e0e6bb2d4e3..72b1fba4430cb2063b5305ee28758dffed272b8a 100644 +index 6e217474e7224cc5cc0a9818d39233c6757eca50..95137b2a064e98e476ef1bc56b0d2b2920f18d17 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3418,7 +3418,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -216,7 +216,7 @@ index 9ee8a871714167c9b71c926a8ad41e0e6bb2d4e3..72b1fba4430cb2063b5305ee28758dff } diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -index 1b8c7da956f43f1bebb3ad73d66a22a55fb0e3f5..b8687b3c6386288609cfb1980da2ee727acae03e 100644 +index aae2093c42d76af5bdb0d4bda3e5ee362a2143e3..743aac4ba5d08ef3e6b67136bd4919b62411a7a0 100644 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java @@ -111,7 +111,7 @@ public class FallingBlockEntity extends Entity { diff --git a/patches/server/0014-Use-Optimised-TrackedEntityMap.patch b/patches/server/0013-Use-Optimised-TrackedEntityMap.patch similarity index 91% rename from patches/server/0014-Use-Optimised-TrackedEntityMap.patch rename to patches/server/0013-Use-Optimised-TrackedEntityMap.patch index 65454f3..ff2cd6b 100644 --- a/patches/server/0014-Use-Optimised-TrackedEntityMap.patch +++ b/patches/server/0013-Use-Optimised-TrackedEntityMap.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use Optimised TrackedEntityMap diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index f3d4f8ba3bc148e28cab1a4d3def805081391ecc..24e0eaf25b2b366fd0e63a530c90f233c11d1bca 100644 +index bb6a2be67394b9a6904d759b7564008dd1c282b3..8a817dda325898b759de63ab6e4300b050286bf7 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -251,7 +251,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0015-Copy-EntityList-methods-to-BasicEntityList.patch b/patches/server/0014-Copy-EntityList-methods-to-BasicEntityList.patch similarity index 100% rename from patches/server/0015-Copy-EntityList-methods-to-BasicEntityList.patch rename to patches/server/0014-Copy-EntityList-methods-to-BasicEntityList.patch diff --git a/patches/server/0017-Add-utility-methods-to-EntitySlices.patch b/patches/server/0015-Add-utility-methods-to-EntitySlices.patch similarity index 100% rename from patches/server/0017-Add-utility-methods-to-EntitySlices.patch rename to patches/server/0015-Add-utility-methods-to-EntitySlices.patch diff --git a/patches/server/0016-Optimise-ClassInstanceMultiMap-removals.patch b/patches/server/0016-Optimise-ClassInstanceMultiMap-removals.patch deleted file mode 100644 index d0865b6..0000000 --- a/patches/server/0016-Optimise-ClassInstanceMultiMap-removals.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Samsuik -Date: Fri, 15 Oct 2021 18:49:48 +0100 -Subject: [PATCH] Optimise ClassInstanceMultiMap removals - - -diff --git a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java -index 5fb7573022c5af775b2e737dcd05c53cd9ae39ec..a3e5bf8355bbe8d4b8ee687abdb49a04fb39ae75 100644 ---- a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java -+++ b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java -@@ -15,7 +15,7 @@ import java.util.stream.Collectors; - public class ClassInstanceMultiMap extends AbstractCollection { - private final Map, List> byClass = Maps.newHashMap(); - private final Class baseClass; -- private final List allInstances = Lists.newArrayList(); -+ private final List allInstances = new me.samsuik.sakura.utils.collections.UnorderedIndexedList<>(); // Sakura - - public ClassInstanceMultiMap(Class elementType) { - this.baseClass = elementType; -@@ -59,7 +59,15 @@ public class ClassInstanceMultiMap extends AbstractCollection { - throw new IllegalArgumentException("Don't know how to search for " + type); - } else { - List list = this.byClass.computeIfAbsent(type, (typeClass) -> { -- return this.allInstances.stream().filter(typeClass::isInstance).collect(Collectors.toList()); -+ // Sakura start -+ List result = new me.samsuik.sakura.utils.collections.UnorderedIndexedList<>(); -+ for (T allInstance : this.allInstances) { -+ if (typeClass.isInstance(allInstance)) { -+ result.add(allInstance); -+ } -+ } -+ return result; -+ // Sakura end - }); - return (Collection) Collections.unmodifiableCollection(list); // Sakura - decompile fix - } diff --git a/patches/server/0018-Store-Entity-Data-State.patch b/patches/server/0016-Store-Entity-Data-State.patch similarity index 95% rename from patches/server/0018-Store-Entity-Data-State.patch rename to patches/server/0016-Store-Entity-Data-State.patch index 08eca82..abe9a51 100644 --- a/patches/server/0018-Store-Entity-Data-State.patch +++ b/patches/server/0016-Store-Entity-Data-State.patch @@ -52,7 +52,7 @@ index 0000000000000000000000000000000000000000..c9f2c5ae57878283e8c8bc3847fe63b9 + +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7798dc673517ea59635b75b130f3dcd7fa0828ee..cc63a577e36962e811be097474433751a22bfb63 100644 +index 95137b2a064e98e476ef1bc56b0d2b2920f18d17..e657b5f88195f1db2cb9a9a97f255ff23992cadd 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -584,6 +584,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -82,7 +82,7 @@ index 7798dc673517ea59635b75b130f3dcd7fa0828ee..cc63a577e36962e811be097474433751 public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 56572702d58f6dac38891e9c95979f927280a975..fb2fa37ba62d9945dfb89efbc5609ecd94cfd6c1 100644 +index dc8d34adac1a2834777a8fe1fe7f142e0b13c0bf..684fd53a34fae43cd916a6f0a5cf38a2505d9bfe 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1330,6 +1330,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0019-Merge-Cannon-Entities.patch b/patches/server/0017-Merge-Cannon-Entities.patch similarity index 98% rename from patches/server/0019-Merge-Cannon-Entities.patch rename to patches/server/0017-Merge-Cannon-Entities.patch index 1c441c3..19861f9 100644 --- a/patches/server/0019-Merge-Cannon-Entities.patch +++ b/patches/server/0017-Merge-Cannon-Entities.patch @@ -169,10 +169,10 @@ index 0000000000000000000000000000000000000000..e63935c17e213bf60571d120ad9ce311 + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 06af35cba1a7b9c11cade2bcd0cc72c4bc28e56f..f68da3e0168c9462aa05cce11e523b9cefefd7e7 100644 +index 3c98362624e1b02b6b028db95564254e044c7b0d..f78881fcf186c44da243c2f31ff855b878e172cf 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1738,6 +1738,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop extends Sensor +@@ -15,8 +15,21 @@ public class NearestLivingEntitySensor extends Sensor @Override protected void doTick(ServerLevel world, T entity) { AABB aABB = entity.getBoundingBox().inflate((double)this.radiusXZ(), (double)this.radiusY(), (double)this.radiusXZ()); -- List list = world.getEntitiesOfClass(LivingEntity.class, aABB, (e) -> { -- return e != entity && e.isAlive(); -- }); +- List list = world.getEntitiesOfClass(LivingEntity.class, aABB, e -> e != entity && e.isAlive()); - list.sort(Comparator.comparingDouble(entity::distanceToSqr)); -+ // Sakura start - reduce nearest living sensing ++ // Sakura start - reduce nearest living entity sensing + var distanceMap = new it.unimi.dsi.fastutil.objects.Reference2DoubleOpenHashMap<>(); + distanceMap.defaultReturnValue(Double.MAX_VALUE); + List list = world.getLimitedEntitiesOfClass(LivingEntity.class, aABB, (e) -> { @@ -30,7 +28,7 @@ index d8cf99a3014a4b8152ae819fa663c2fdf34dce57..f7c3684ddd7c9c5386256511a867c29f + return true; + }, 12, Integer.MAX_VALUE); + java.util.Collections.reverse(list); -+ // Sakura end ++ // Sakura end - reduce nearest living entity sensing Brain brain = entity.getBrain(); brain.setMemory(MemoryModuleType.NEAREST_LIVING_ENTITIES, list); brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, new NearestVisibleLivingEntities(entity, list)); diff --git a/patches/server/0037-Consistent-Explosion-Radius.patch b/patches/server/0035-Consistent-Explosion-Radius.patch similarity index 91% rename from patches/server/0037-Consistent-Explosion-Radius.patch rename to patches/server/0035-Consistent-Explosion-Radius.patch index de00e44..1dd8d46 100644 --- a/patches/server/0037-Consistent-Explosion-Radius.patch +++ b/patches/server/0035-Consistent-Explosion-Radius.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Consistent Explosion Radius diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 36990070ea39b16ed5b4cb7ec7fd31017dc86d2a..a1b5878567f1489419006306e26af4936983cc2a 100644 +index 01165a3543a28297f609dcdfe6a60bf8191ab04e..b01930533e4c24d3fa4566a8462ac7ceeb9184f1 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -577,7 +577,7 @@ public class Explosion { diff --git a/patches/server/0038-Remove-spigot-max-tnt-per-tick.patch b/patches/server/0036-Remove-spigot-max-tnt-per-tick.patch similarity index 100% rename from patches/server/0038-Remove-spigot-max-tnt-per-tick.patch rename to patches/server/0036-Remove-spigot-max-tnt-per-tick.patch diff --git a/patches/server/0039-Option-to-configure-entity-water-sensitivity.patch b/patches/server/0037-Option-to-configure-entity-water-sensitivity.patch similarity index 91% rename from patches/server/0039-Option-to-configure-entity-water-sensitivity.patch rename to patches/server/0037-Option-to-configure-entity-water-sensitivity.patch index 3308c8d..81a1fb9 100644 --- a/patches/server/0039-Option-to-configure-entity-water-sensitivity.patch +++ b/patches/server/0037-Option-to-configure-entity-water-sensitivity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to configure entity water sensitivity diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d20cf4f957da6b11551335bbe99e49cf33d52ae7..37d7cc7b53b773f1864622fc6dc38e647003236a 100644 +index e75322367764805443f9a9f5639d804b87a0ab5e..faa95807bb2afbeb90b31f8bee0d30b590a10075 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3528,7 +3528,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0040-Configure-cannon-physics-by-version.patch b/patches/server/0038-Configure-cannon-physics-by-version.patch similarity index 96% rename from patches/server/0040-Configure-cannon-physics-by-version.patch rename to patches/server/0038-Configure-cannon-physics-by-version.patch index 2fa59c5..50ed7b6 100644 --- a/patches/server/0040-Configure-cannon-physics-by-version.patch +++ b/patches/server/0038-Configure-cannon-physics-by-version.patch @@ -119,7 +119,7 @@ index cecc88aa129e201ebe85f7ca9cfd73bc25f2f902..78b08a9557e9fd98251714dce9ba1180 x /= distance; y /= distance; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e682b52c6f295506f25223950e73188ed5eb4e1a..c596f553bfce8db067c3a3df2f366878fd97376a 100644 +index 07c4cb5d91d0f7549fb92bfc03d730145e63a7d5..445899d4664b3bba467c0f8e5e390e13a2744b4d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -380,7 +380,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -499,7 +499,7 @@ index 19397e2556a3cdc7180a5f8889aefb5ef23715b7..26fc6a8018cfde3c219a7d828f743663 // Paper end - Option to prevent TNT from moving in water } diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index a1b5878567f1489419006306e26af4936983cc2a..30666a0f35a9a8be47ecd2630389490508ba35fd 100644 +index b01930533e4c24d3fa4566a8462ac7ceeb9184f1..50621055665ca973875fa06e5fd274c6398fa06f 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -74,6 +74,7 @@ public class Explosion { @@ -585,7 +585,7 @@ index a1b5878567f1489419006306e26af4936983cc2a..30666a0f35a9a8be47ecd26303894905 if (data == null || !data.isExpandable() && (blockDensity == 0.0f || blockDensity == 1.0f)) { level.densityCache.createCache(key, entity, vec3d, blockDensity); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index ebfdcadc3e2e28fb791afd3d5708df0bc0741464..e6b12380dbab67d930b761f4ab9f493f9e895024 100644 +index d54fb6906d66a6feeea3463cb2f38d10b52d2e41..19b50f4f68c3a389f1169cf072dfd0a896475fe3 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -266,6 +266,205 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -795,7 +795,7 @@ index ebfdcadc3e2e28fb791afd3d5708df0bc0741464..e6b12380dbab67d930b761f4ab9f493f protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, RegistryAccess iregistrycustom, Holder holder, Supplier supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function paperWorldConfigCreator, Supplier sakuraWorldConfigCreator, java.util.concurrent.Executor executor) { // Sakura // Paper - create paper world config; Async-Anti-Xray: Pass executor this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot diff --git a/src/main/java/net/minecraft/world/level/block/FallingBlock.java b/src/main/java/net/minecraft/world/level/block/FallingBlock.java -index 1079a99d6a6c9fba36414a863e1454bb2a7f298a..4ee105548df2a730f192d4b511a399d129824df6 100644 +index 7c994b72820cbff158009e86b7d540cb479b01b2..6456e0c20d654b6b001e73bf815da9efd2883a1c 100644 --- a/src/main/java/net/minecraft/world/level/block/FallingBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FallingBlock.java @@ -35,6 +35,15 @@ public abstract class FallingBlock extends Block implements Fallable { @@ -835,18 +835,18 @@ index 6524272aab5a876e2a2164181da72c765959b550..4c242b501e7e5c7af6676b9554b00405 world.playSound((Player) null, pos, flag1 ? this.type.fenceGateOpen() : this.type.fenceGateClose(), SoundSource.BLOCKS, 1.0F, world.getRandom().nextFloat() * 0.1F + 0.9F); world.gameEvent((Entity) null, flag1 ? GameEvent.BLOCK_OPEN : GameEvent.BLOCK_CLOSE, pos); diff --git a/src/main/java/net/minecraft/world/level/block/LadderBlock.java b/src/main/java/net/minecraft/world/level/block/LadderBlock.java -index de87b54895d5a63d32c1734ccdac63246c9f2c5f..79bced0e284430d57d4a7ec80a57d717249e7e36 100644 +index dbfbf477ceef5bd162e1740471f719466f49c1a8..86ed1e1cdbab5004a767831bcb0b34d2b2c3adf8 100644 --- a/src/main/java/net/minecraft/world/level/block/LadderBlock.java +++ b/src/main/java/net/minecraft/world/level/block/LadderBlock.java @@ -28,6 +28,21 @@ public class LadderBlock extends Block implements SimpleWaterloggedBlock { - protected static final VoxelShape WEST_AABB = Block.box(13.0D, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D); - protected static final VoxelShape SOUTH_AABB = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, 3.0D); - protected static final VoxelShape NORTH_AABB = Block.box(0.0D, 0.0D, 13.0D, 16.0D, 16.0D, 16.0D); -+ // Sakura start -+ protected static final VoxelShape LEGACY_EAST_AABB = Block.box(0.0D, 0.0D, 0.0D, 2.0D, 16.0D, 16.0D); -+ protected static final VoxelShape LEGACY_WEST_AABB = Block.box(14.0D, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D); -+ protected static final VoxelShape LEGACY_SOUTH_AABB = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, 2.0D); -+ protected static final VoxelShape LEGACY_NORTH_AABB = Block.box(0.0D, 0.0D, 14.0D, 16.0D, 16.0D, 16.0D); + protected static final VoxelShape WEST_AABB = Block.box(13.0, 0.0, 0.0, 16.0, 16.0, 16.0); + protected static final VoxelShape SOUTH_AABB = Block.box(0.0, 0.0, 0.0, 16.0, 16.0, 3.0); + protected static final VoxelShape NORTH_AABB = Block.box(0.0, 0.0, 13.0, 16.0, 16.0, 16.0); ++ // Sakura start - physics version api ++ protected static final VoxelShape LEGACY_EAST_AABB = Block.box(0.0, 0.0, 0.0, 2.0, 16.0, 16.0); ++ protected static final VoxelShape LEGACY_WEST_AABB = Block.box(14.0, 0.0, 0.0, 16.0, 16.0, 16.0); ++ protected static final VoxelShape LEGACY_SOUTH_AABB = Block.box(0.0, 0.0, 0.0, 16.0, 16.0, 2.0); ++ protected static final VoxelShape LEGACY_NORTH_AABB = Block.box(0.0, 0.0, 14.0, 16.0, 16.0, 16.0); + + private static VoxelShape legacyShape(Direction facing) { + return switch (facing) { @@ -856,7 +856,7 @@ index de87b54895d5a63d32c1734ccdac63246c9f2c5f..79bced0e284430d57d4a7ec80a57d717 + default -> LEGACY_EAST_AABB; + }; + } -+ // Sakura end ++ // Sakura end - physics version api @Override public MapCodec codec() { @@ -864,7 +864,7 @@ index de87b54895d5a63d32c1734ccdac63246c9f2c5f..79bced0e284430d57d4a7ec80a57d717 this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(WATERLOGGED, Boolean.valueOf(false))); } -+ // Sakura start ++ // Sakura start - physics version api + @Override + public final boolean hasDynamicShape() { + return true; @@ -875,7 +875,7 @@ index de87b54895d5a63d32c1734ccdac63246c9f2c5f..79bced0e284430d57d4a7ec80a57d717 + if (world instanceof net.minecraft.world.level.Level level && level.localConfig().config(pos).physicsVersion.before(1_9_0)) { + return legacyShape(state.getValue(FACING)); + } -+ // Sakura end ++ // Sakura end - physics version api switch ((Direction)state.getValue(FACING)) { case NORTH: return NORTH_AABB; @@ -959,7 +959,7 @@ index 05e14322e519d1399e87beb532e1cc4a95f689aa..8b86ec469d7d0a0a7a62d563bd585b5b } diff --git a/src/main/java/net/minecraft/world/level/block/piston/MovingPistonBlock.java b/src/main/java/net/minecraft/world/level/block/piston/MovingPistonBlock.java -index d3d1ad7901411574b85b0febd1c7ddaa8ad7c9f4..cc2c601032b2a2d94aa74cc3ad7169c202b354ab 100644 +index 54abde54b2341d85c6f02a0a28f02a0e229de42b..4bd60b3f16809bb89212ada6dfc374f0595fec80 100644 --- a/src/main/java/net/minecraft/world/level/block/piston/MovingPistonBlock.java +++ b/src/main/java/net/minecraft/world/level/block/piston/MovingPistonBlock.java @@ -111,6 +111,17 @@ public class MovingPistonBlock extends BaseEntityBlock { @@ -997,10 +997,10 @@ index be74adc86f0ca467f3b59e7b57fd47a8f381d86e..cd66c83a91ea9ee9f3f48af40889e2d5 } diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonHeadBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonHeadBlock.java -index 5301095fa3baac1bde3767153ee2343026596688..1ef830d5e34f25c08d53d693db99a6eb641ebbe5 100644 +index d62cc6e8075b6c1564df29c1b15e8c0246ae786c..b8c33de8aff6c7df5e4e6b628a06d59e8fec4199 100644 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonHeadBlock.java +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonHeadBlock.java -@@ -139,6 +139,11 @@ public class PistonHeadBlock extends DirectionalBlock { +@@ -138,6 +138,11 @@ public class PistonHeadBlock extends DirectionalBlock { @Override public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { BlockState blockState = world.getBlockState(pos.relative(state.getValue(FACING).getOpposite())); @@ -1012,7 +1012,7 @@ index 5301095fa3baac1bde3767153ee2343026596688..1ef830d5e34f25c08d53d693db99a6eb return this.isFittingBase(state, blockState) || blockState.is(Blocks.MOVING_PISTON) && blockState.getValue(FACING) == state.getValue(FACING); } -@@ -146,6 +151,10 @@ public class PistonHeadBlock extends DirectionalBlock { +@@ -145,6 +150,10 @@ public class PistonHeadBlock extends DirectionalBlock { public void neighborChanged(BlockState state, Level world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { if (state.canSurvive(world, pos)) { world.neighborChanged(pos.relative(state.getValue(FACING).getOpposite()), sourceBlock, sourcePos); @@ -1021,29 +1021,28 @@ index 5301095fa3baac1bde3767153ee2343026596688..1ef830d5e34f25c08d53d693db99a6eb + world.setBlock(pos, Blocks.AIR.defaultBlockState(), 19); + // Sakura end } - } + diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java -index 3a4a6c635337bb10482cfadf1a4673c56fcc2ed4..356ce30678fe9428c950582e0d8b47c9ac75f87d 100644 +index c89e1fe5fafac46d82b2b20d27586c6997ce8906..ef35f0151252a1c1b09a73eecc7ed2f63820d763 100644 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java -@@ -159,6 +159,13 @@ public class PistonMovingBlockEntity extends BlockEntity { +@@ -163,6 +163,12 @@ public class PistonMovingBlockEntity extends BlockEntity { - double i = 0.0D; + double i = 0.0; + // Sakura start - physics version api + if (entity.physics().before(1_11_0)) { + moveEntityByPistonFromDirection(direction, entity, aABB); + return; + } -+ // Sakura end -+ - for(AABB aABB2 : list2) { ++ // Sakura end - physics version api + for (AABB aABB2 : list2) { AABB aABB3 = PistonMath.getMovementArea(moveByPositionAndProgress(pos, aABB2, blockEntity), direction, d); AABB aABB4 = entity.getBoundingBox(); -@@ -280,14 +287,154 @@ public class PistonMovingBlockEntity extends BlockEntity { +@@ -292,14 +298,154 @@ public class PistonMovingBlockEntity extends BlockEntity { + } } - } + + // Sakura start - physics version api @@ -1175,15 +1174,15 @@ index 3a4a6c635337bb10482cfadf1a4673c56fcc2ed4..356ce30678fe9428c950582e0d8b47c9 + + entity.move(MoverType.PISTON, new Vec3(movX * direction.getStepX(), movY * direction.getStepY(), movZ * direction.getStepZ())); + } -+ // Sakura end ++ // Sakura end - physics version api public static void tick(Level world, BlockPos pos, BlockState state, PistonMovingBlockEntity blockEntity) { -+ me.samsuik.sakura.physics.PhysicsVersion physicsVersion = world.localConfig().config(pos).physicsVersion; // Sakura ++ me.samsuik.sakura.physics.PhysicsVersion physicsVersion = world.localConfig().config(pos).physicsVersion; // Sakura - physics version api blockEntity.lastTicked = world.getGameTime(); blockEntity.progressO = blockEntity.progress; if (blockEntity.progressO >= 1.0F) { if (world.isClientSide && blockEntity.deathTicks < 5) { - ++blockEntity.deathTicks; + blockEntity.deathTicks++; } else { + // Sakura start - physics version api + if (physicsVersion.isWithin(1_9_0, 1_10_0)) { @@ -1192,11 +1191,11 @@ index 3a4a6c635337bb10482cfadf1a4673c56fcc2ed4..356ce30678fe9428c950582e0d8b47c9 + } else if (physicsVersion.before(1_9_0)) { + blockEntity.moveEntities(world, 0.25f); + } -+ // Sakura end ++ // Sakura end - physics version api world.removeBlockEntity(pos); blockEntity.setRemoved(); if (world.getBlockState(pos).is(Blocks.MOVING_PISTON)) { -@@ -308,13 +455,25 @@ public class PistonMovingBlockEntity extends BlockEntity { +@@ -319,12 +465,23 @@ public class PistonMovingBlockEntity extends BlockEntity { } } else { float f = blockEntity.progress + 0.5F; @@ -1210,15 +1209,13 @@ index 3a4a6c635337bb10482cfadf1a4673c56fcc2ed4..356ce30678fe9428c950582e0d8b47c9 if (blockEntity.progress >= 1.0F) { blockEntity.progress = 1.0F; } - + if (physicsVersion.isWithin(1_9_0, 1_10_0)) { + moveCollidedEntities(world, pos, f, blockEntity); + moveStuckEntities(world, pos, f, blockEntity); + } else if (blockEntity.extending && physicsVersion.before(1_9_0)) { + blockEntity.moveEntities(world, blockEntity.progress - blockEntity.progressO + 0.0625f); + } -+ // Sakura end -+ ++ // Sakura end - physics version api } } @@ -1252,10 +1249,10 @@ index 3bb4a9a1a6249e8ba2de237f801210e7f4fd5825..8dfa05a586bd21ef8aeab713cad46281 @Override diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java -index cde93efaecd42b9081405638af3ba91cb5e184c9..0395dab282ace29b62fe72de36440c9bc0c4bfa6 100644 +index 109f71401c65f476ccf6813137386fc9fef10254..786aba3810b71a543469dab6b2b2c1ff4ca2edd5 100644 --- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java +++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java -@@ -104,7 +104,10 @@ public abstract class WaterFluid extends FlowingFluid { +@@ -120,7 +120,10 @@ public abstract class WaterFluid extends FlowingFluid { @Override public boolean canBeReplacedWith(FluidState state, BlockGetter world, BlockPos pos, Fluid fluid, Direction direction) { diff --git a/patches/server/0041-Allow-water-in-the-nether.patch b/patches/server/0039-Allow-water-in-the-nether.patch similarity index 100% rename from patches/server/0041-Allow-water-in-the-nether.patch rename to patches/server/0039-Allow-water-in-the-nether.patch diff --git a/patches/server/0042-Configure-concrete-solidifying-in-water.patch b/patches/server/0040-Configure-concrete-solidifying-in-water.patch similarity index 100% rename from patches/server/0042-Configure-concrete-solidifying-in-water.patch rename to patches/server/0040-Configure-concrete-solidifying-in-water.patch diff --git a/patches/server/0043-Option-for-fast-nether-dimension-lava.patch b/patches/server/0041-Option-for-fast-nether-dimension-lava.patch similarity index 90% rename from patches/server/0043-Option-for-fast-nether-dimension-lava.patch rename to patches/server/0041-Option-for-fast-nether-dimension-lava.patch index 66524da..eaffbe6 100644 --- a/patches/server/0043-Option-for-fast-nether-dimension-lava.patch +++ b/patches/server/0041-Option-for-fast-nether-dimension-lava.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for fast nether dimension lava diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java -index 1dab5318d8693d15ee879456dff3a1916cfad335..cae1adf85ff35947a9747a21ff887a2ec0a4367a 100644 +index 8dfa05a586bd21ef8aeab713cad4628166982bfa..f8fdb09b7b3f696cd6c7309a90c7fd2138c845ba 100644 --- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java +++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java @@ -183,7 +183,7 @@ public abstract class LavaFluid extends FlowingFluid { diff --git a/patches/server/0044-Allow-explosions-to-destroy-lava.patch b/patches/server/0042-Allow-explosions-to-destroy-lava.patch similarity index 94% rename from patches/server/0044-Allow-explosions-to-destroy-lava.patch rename to patches/server/0042-Allow-explosions-to-destroy-lava.patch index 4dd1214..08cd736 100644 --- a/patches/server/0044-Allow-explosions-to-destroy-lava.patch +++ b/patches/server/0042-Allow-explosions-to-destroy-lava.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow explosions to destroy lava diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 30666a0f35a9a8be47ecd2630389490508ba35fd..5369598d0f81eb44a7aed766ef4fe15eddb0b2c2 100644 +index 50621055665ca973875fa06e5fd274c6398fa06f..03466de75efd0c520b2d9ae2fbaeec46139b2633 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -228,6 +228,10 @@ public class Explosion { diff --git a/patches/server/0045-Disable-bubble-columns-affecting-cannon-entities.patch b/patches/server/0043-Disable-bubble-columns-affecting-cannon-entities.patch similarity index 93% rename from patches/server/0045-Disable-bubble-columns-affecting-cannon-entities.patch rename to patches/server/0043-Disable-bubble-columns-affecting-cannon-entities.patch index 4a73f99..b0ee35a 100644 --- a/patches/server/0045-Disable-bubble-columns-affecting-cannon-entities.patch +++ b/patches/server/0043-Disable-bubble-columns-affecting-cannon-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable bubble columns affecting cannon entities diff --git a/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java b/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java -index 78d98a442ea3c14500ac6ae597ff2a5080b7ce15..852dc46acbee4efd00f845b81d3ec71297a02333 100644 +index addd8b3758254e4f4cd4e951cd065f83ad5dcdf8..2c666b53360b438546f5ffce468a77eed829b039 100644 --- a/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java @@ -48,6 +48,7 @@ public class BubbleColumnBlock extends Block implements BucketPickup { diff --git a/patches/server/0046-Treat-all-collidable-blocks-as-full-while-moving-fas.patch b/patches/server/0044-Treat-all-collidable-blocks-as-full-while-moving-fas.patch similarity index 98% rename from patches/server/0046-Treat-all-collidable-blocks-as-full-while-moving-fas.patch rename to patches/server/0044-Treat-all-collidable-blocks-as-full-while-moving-fas.patch index 10f61ae..33003d8 100644 --- a/patches/server/0046-Treat-all-collidable-blocks-as-full-while-moving-fas.patch +++ b/patches/server/0044-Treat-all-collidable-blocks-as-full-while-moving-fas.patch @@ -59,7 +59,7 @@ index 510d722fffd4bdcee2db42aefa662c49563ffa81..37b6d16f0b1e000eb4082a530c7f7134 AABB singleAABB = blockCollision.getSingleAABBRepresentation(); if (singleAABB != null) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c596f553bfce8db067c3a3df2f366878fd97376a..6baf325f6b985944b6edc13c4e18fb8f0a27910f 100644 +index 445899d4664b3bba467c0f8e5e390e13a2744b4d..9f1e0fd02ff2fcddf0d3e768167350fd4068da05 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -581,6 +581,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0047-Add-redstone-implementation-API.patch b/patches/server/0045-Add-redstone-implementation-API.patch similarity index 100% rename from patches/server/0047-Add-redstone-implementation-API.patch rename to patches/server/0045-Add-redstone-implementation-API.patch diff --git a/patches/server/0048-Reduce-entity-tracker-player-updates.patch b/patches/server/0046-Reduce-entity-tracker-player-updates.patch similarity index 96% rename from patches/server/0048-Reduce-entity-tracker-player-updates.patch rename to patches/server/0046-Reduce-entity-tracker-player-updates.patch index fdc42fc..6225802 100644 --- a/patches/server/0048-Reduce-entity-tracker-player-updates.patch +++ b/patches/server/0046-Reduce-entity-tracker-player-updates.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reduce entity tracker player updates diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 2313f390c96dcbea1dca65ad3de5b9e74571297f..a725ee3bdda510d540afb78553543c8d164e3d68 100644 +index 8a817dda325898b759de63ab6e4300b050286bf7..baec8d775957f3ef3224d743f961f0a23aee92ab 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1145,6 +1145,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0049-Add-option-for-legacy-lava-block-formation.patch b/patches/server/0047-Add-option-for-legacy-lava-block-formation.patch similarity index 90% rename from patches/server/0049-Add-option-for-legacy-lava-block-formation.patch rename to patches/server/0047-Add-option-for-legacy-lava-block-formation.patch index f9fa785..2429dc3 100644 --- a/patches/server/0049-Add-option-for-legacy-lava-block-formation.patch +++ b/patches/server/0047-Add-option-for-legacy-lava-block-formation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option for legacy lava block formation diff --git a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java -index 2fe44dae063eb0cd7d4813fb6b2937830d432e51..aaac136acbef15a1925b4b6e8da7bfc4f75360de 100644 +index 1ed3568b363df38b196567d8a93089550913d659..e5d9b9c1c86b0beab3efdd4784582fd9de0bf926 100644 --- a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java +++ b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java @@ -199,7 +199,15 @@ public class LiquidBlock extends Block implements BucketPickup { @@ -26,7 +26,7 @@ index 2fe44dae063eb0cd7d4813fb6b2937830d432e51..aaac136acbef15a1925b4b6e8da7bfc4 // SANITY: In legacy a patch by paper removes the fluid level condition from vanilla. if (physics.afterOrEqual(1_16_0) || physics.isLegacy() diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java -index cae1adf85ff35947a9747a21ff887a2ec0a4367a..56dcba3560fb13be9d13b400aea681de98ca800d 100644 +index f8fdb09b7b3f696cd6c7309a90c7fd2138c845ba..c3c24f616345e41772062032406c308ca130147d 100644 --- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java +++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java @@ -177,7 +177,7 @@ public abstract class LavaFluid extends FlowingFluid { @@ -39,10 +39,10 @@ index cae1adf85ff35947a9747a21ff887a2ec0a4367a..56dcba3560fb13be9d13b400aea681de } diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java -index 521b8084e490d5f3ecacd1d7368dddee22647aa9..7987b45130e2eeba1dca4bc8bba9efe0cd8b209c 100644 +index 786aba3810b71a543469dab6b2b2c1ff4ca2edd5..f883b9b0a336591dcf685cf34ad09eee832992c2 100644 --- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java +++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java -@@ -106,7 +106,7 @@ public abstract class WaterFluid extends FlowingFluid { +@@ -122,7 +122,7 @@ public abstract class WaterFluid extends FlowingFluid { public boolean canBeReplacedWith(FluidState state, BlockGetter world, BlockPos pos, Fluid fluid, Direction direction) { // Sakura start return direction == Direction.DOWN && !fluid.is(FluidTags.WATER) diff --git a/patches/server/0050-Configure-mob-spawner-defaults.patch b/patches/server/0048-Configure-mob-spawner-defaults.patch similarity index 100% rename from patches/server/0050-Configure-mob-spawner-defaults.patch rename to patches/server/0048-Configure-mob-spawner-defaults.patch diff --git a/patches/server/0051-Allow-disabling-random-dispenser-item-selection.patch b/patches/server/0049-Allow-disabling-random-dispenser-item-selection.patch similarity index 100% rename from patches/server/0051-Allow-disabling-random-dispenser-item-selection.patch rename to patches/server/0049-Allow-disabling-random-dispenser-item-selection.patch diff --git a/patches/server/0052-Add-instant-mob-death-animation.patch b/patches/server/0050-Add-instant-mob-death-animation.patch similarity index 91% rename from patches/server/0052-Add-instant-mob-death-animation.patch rename to patches/server/0050-Add-instant-mob-death-animation.patch index b55226b..9364928 100644 --- a/patches/server/0052-Add-instant-mob-death-animation.patch +++ b/patches/server/0050-Add-instant-mob-death-animation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add instant mob death animation diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index decb925446701a38455d7f33a676e73858946e67..9cdce5f522e62594fa359b24408950abe15e632a 100644 +index faa95807bb2afbeb90b31f8bee0d30b590a10075..9fa79ba7f50fa20f3794fd955db1a4cc0fa8ee02 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1776,6 +1776,12 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0053-Configure-fluids-breaking-redstone.patch b/patches/server/0051-Configure-fluids-breaking-redstone.patch similarity index 100% rename from patches/server/0053-Configure-fluids-breaking-redstone.patch rename to patches/server/0051-Configure-fluids-breaking-redstone.patch diff --git a/patches/server/0054-Option-to-disable-explosions-hurting-players.patch b/patches/server/0052-Option-to-disable-explosions-hurting-players.patch similarity index 100% rename from patches/server/0054-Option-to-disable-explosions-hurting-players.patch rename to patches/server/0052-Option-to-disable-explosions-hurting-players.patch diff --git a/patches/server/0055-Iron-golems-take-fall-damage.patch b/patches/server/0053-Iron-golems-take-fall-damage.patch similarity index 93% rename from patches/server/0055-Iron-golems-take-fall-damage.patch rename to patches/server/0053-Iron-golems-take-fall-damage.patch index 72cbf75..5217d38 100644 --- a/patches/server/0055-Iron-golems-take-fall-damage.patch +++ b/patches/server/0053-Iron-golems-take-fall-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Iron golems take fall damage diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java -index f383928fc5b331ddf128bdcb6a23010d8fe088d3..4dd778901f0327d30b993dffd73f75f631bb3a9b 100644 +index 6cfe0d6c46caa122db107c607d27a2bdcd82f7a8..fdfb04589869fc06908b61899c225cccb168e117 100644 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java @@ -240,6 +240,20 @@ public class IronGolem extends AbstractGolem implements NeutralMob { diff --git a/patches/server/0056-Add-explosions-dropping-items-config.patch b/patches/server/0054-Add-explosions-dropping-items-config.patch similarity index 89% rename from patches/server/0056-Add-explosions-dropping-items-config.patch rename to patches/server/0054-Add-explosions-dropping-items-config.patch index 25fc3fb..124d57e 100644 --- a/patches/server/0056-Add-explosions-dropping-items-config.patch +++ b/patches/server/0054-Add-explosions-dropping-items-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add explosions dropping items config diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 5369598d0f81eb44a7aed766ef4fe15eddb0b2c2..857316fe04acf0eed5046c6789ed8c7829bb5eb8 100644 +index 03466de75efd0c520b2d9ae2fbaeec46139b2633..9ea5995b591366fc47f5142ca25805ec28f0c3f4 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -902,6 +902,12 @@ public class Explosion { diff --git a/patches/server/0057-Optimise-check-inside-blocks-and-fluids.patch b/patches/server/0055-Optimise-check-inside-blocks-and-fluids.patch similarity index 98% rename from patches/server/0057-Optimise-check-inside-blocks-and-fluids.patch rename to patches/server/0055-Optimise-check-inside-blocks-and-fluids.patch index de36440..42d5789 100644 --- a/patches/server/0057-Optimise-check-inside-blocks-and-fluids.patch +++ b/patches/server/0055-Optimise-check-inside-blocks-and-fluids.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimise check inside blocks and fluids diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 192416a406feb5892862848ed30d395dae665a8e..584520739e41d4372e2c4040fc6b2363927e7187 100644 +index 9f1e0fd02ff2fcddf0d3e768167350fd4068da05..a7d57d6549e6e233dcac6f3fd61a1aee83b8acd4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1997,18 +1997,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0058-Fix-paper-findSupportingBlock-not-updating-last-chun.patch b/patches/server/0056-Fix-paper-findSupportingBlock-not-updating-last-chun.patch similarity index 90% rename from patches/server/0058-Fix-paper-findSupportingBlock-not-updating-last-chun.patch rename to patches/server/0056-Fix-paper-findSupportingBlock-not-updating-last-chun.patch index 597045a..6ea0176 100644 --- a/patches/server/0058-Fix-paper-findSupportingBlock-not-updating-last-chun.patch +++ b/patches/server/0056-Fix-paper-findSupportingBlock-not-updating-last-chun.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix paper findSupportingBlock not updating last chunk diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index a93e22d81939cc7fa3247550da91bb39e6d5b111..798c817dd75615458a60c3063174ad7da175eb51 100644 +index 19b50f4f68c3a389f1169cf072dfd0a896475fe3..c824dc2477b309d571231d3e80deb838d28bd0e7 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -896,6 +896,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0059-Avoid-searching-for-lava-if-throttled-water-flow-spe.patch b/patches/server/0057-Avoid-searching-for-lava-if-throttled-water-flow-spe.patch similarity index 100% rename from patches/server/0059-Avoid-searching-for-lava-if-throttled-water-flow-spe.patch rename to patches/server/0057-Avoid-searching-for-lava-if-throttled-water-flow-spe.patch diff --git a/patches/server/0060-Calculate-biome-noise-once-per-chunk-section.patch b/patches/server/0058-Calculate-biome-noise-once-per-chunk-section.patch similarity index 94% rename from patches/server/0060-Calculate-biome-noise-once-per-chunk-section.patch rename to patches/server/0058-Calculate-biome-noise-once-per-chunk-section.patch index e5f7de4..9e1c5fb 100644 --- a/patches/server/0060-Calculate-biome-noise-once-per-chunk-section.patch +++ b/patches/server/0058-Calculate-biome-noise-once-per-chunk-section.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Calculate biome noise once per chunk section diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java -index f0de72afad4bb571153436399386a6a8a70582a6..0e38415230f4c59727cd8414ed3ff19b3b32f183 100644 +index 796bbef3544e06b8e7aac7e8ac5f740a2613f4bd..27ba0a6d3439b9b4dfae3b9c49975879c4295443 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java @@ -227,12 +227,18 @@ public class LevelChunkSection { diff --git a/patches/server/0061-Fix-doEntityDrops-gamerule-preventing-falling-blocks.patch b/patches/server/0059-Fix-doEntityDrops-gamerule-preventing-falling-blocks.patch similarity index 100% rename from patches/server/0061-Fix-doEntityDrops-gamerule-preventing-falling-blocks.patch rename to patches/server/0059-Fix-doEntityDrops-gamerule-preventing-falling-blocks.patch diff --git a/patches/server/0062-Add-entity-travel-distance-limits.patch b/patches/server/0060-Add-entity-travel-distance-limits.patch similarity index 93% rename from patches/server/0062-Add-entity-travel-distance-limits.patch rename to patches/server/0060-Add-entity-travel-distance-limits.patch index 0d2340e..c71ffb9 100644 --- a/patches/server/0062-Add-entity-travel-distance-limits.patch +++ b/patches/server/0060-Add-entity-travel-distance-limits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add entity travel distance limits diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 942000dd75d1467ed59063173423bb737021be89..0321f48070d2d264e18837a888527543aad78cc2 100644 +index 17c40c04f1a1df05b9740c9e32078d0347c4baa4..d6474f27806b2c7a6f7e844cfaaea4985dddd6c0 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1417,6 +1417,11 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -21,7 +21,7 @@ index 942000dd75d1467ed59063173423bb737021be89..0321f48070d2d264e18837a888527543 } else { entity.inactiveTick(); } // Paper - EAR 2 this.getProfiler().pop(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 584520739e41d4372e2c4040fc6b2363927e7187..8ecf39f1ff7184bb67969b830bb11e2100695c1e 100644 +index a7d57d6549e6e233dcac6f3fd61a1aee83b8acd4..bdae4d33d01569accd6a184b5bed2539a68ec457 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -730,6 +730,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0063-Configure-potion-speed-and-breaking-inside-entities.patch b/patches/server/0061-Configure-potion-speed-and-breaking-inside-entities.patch similarity index 92% rename from patches/server/0063-Configure-potion-speed-and-breaking-inside-entities.patch rename to patches/server/0061-Configure-potion-speed-and-breaking-inside-entities.patch index 1949245..a98b4f8 100644 --- a/patches/server/0063-Configure-potion-speed-and-breaking-inside-entities.patch +++ b/patches/server/0061-Configure-potion-speed-and-breaking-inside-entities.patch @@ -18,20 +18,20 @@ index 156809090f1f83ad68e7e2477a3cfddac5757a8e..f834a3a2634a7b245ea8881b2cc61329 if (entity != null) { diff --git a/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java b/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java -index 391ba45cce8196720e1856626067857ad8ad2443..9d38a45f8fc6583db7dd51aa7d9d69b38ebc256a 100644 +index 8bf45af0b802b90b7e27197ca16e9f2ebe0162e9..3ab65cb7d891ddba011afd795dbf699f37cb8a17 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java +++ b/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java -@@ -49,7 +49,14 @@ public final class ProjectileUtil { +@@ -51,7 +51,14 @@ public final class ProjectileUtil { vec3 = hitResult.getLocation(); } -- HitResult hitResult2 = getEntityHitResult(world, entity, pos, vec3, entity.getBoundingBox().expandTowards(velocity).inflate(1.0D), predicate, margin); +- HitResult hitResult2 = getEntityHitResult(world, entity, pos, vec3, entity.getBoundingBox().expandTowards(velocity).inflate(1.0), predicate, margin); + // Sakura start - configure potion mechanics + final HitResult hitResult2; + if (world.sakuraConfig().entity.thrownPotion.allowBreakingInsideEntities && entity instanceof ThrownPotion) { -+ hitResult2 = getEntityHitResult(entity, pos, vec3, entity.getBoundingBox().expandTowards(velocity).inflate(1.0D), predicate, margin); ++ hitResult2 = getEntityHitResult(entity, pos, vec3, entity.getBoundingBox().expandTowards(velocity).inflate(1.0), predicate, margin); + } else { -+ hitResult2 = getEntityHitResult(world, entity, pos, vec3, entity.getBoundingBox().expandTowards(velocity).inflate(1.0D), predicate, margin); ++ hitResult2 = getEntityHitResult(world, entity, pos, vec3, entity.getBoundingBox().expandTowards(velocity).inflate(1.0), predicate, margin); + } + // Sakura end - configure potion mechanics if (hitResult2 != null) { diff --git a/patches/server/0064-Add-outline-colliison-to-enderpearls.patch b/patches/server/0062-Add-outline-colliison-to-enderpearls.patch similarity index 100% rename from patches/server/0064-Add-outline-colliison-to-enderpearls.patch rename to patches/server/0062-Add-outline-colliison-to-enderpearls.patch diff --git a/patches/server/0065-Disable-player-poses-shrinking-collision-box.patch b/patches/server/0063-Disable-player-poses-shrinking-collision-box.patch similarity index 100% rename from patches/server/0065-Disable-player-poses-shrinking-collision-box.patch rename to patches/server/0063-Disable-player-poses-shrinking-collision-box.patch