diff --git a/gradle.properties b/gradle.properties index dd8f75ee..22a46c53 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = patina.patina version = 1.20.4-R0.1-SNAPSHOT mcVersion = 1.20.4 -paperRef = b3c81089ae26cc3ad2e7388c7b64457f3f83c98a +paperRef = 581fb30a4c80a8b10e41ddb0801747da53f57e62 org.gradle.parallel = true org.gradle.caching = true diff --git a/patches/api/0004-Suspected-plugins-report.patch b/patches/api/0004-Suspected-plugins-report.patch index 0ac1c377..fb0803e9 100644 --- a/patches/api/0004-Suspected-plugins-report.patch +++ b/patches/api/0004-Suspected-plugins-report.patch @@ -47,10 +47,10 @@ index 899d67fa782fac639fe7fb096e05c551d75bd647..0de79dca263c58f9a6a1c6707e90452d + // Yatopia end } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -index 5cd236965de12392d8c7aa81307c0ff1cc8673b1..d91399ed743de3a3441f98c3c38a294c659dc0bc 100644 +index 34037d3da2c536bac088e0ff629ee8f1daccc65b..c946eb6d60f13c7f5eeac77ccace7fa26f710cf5 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -@@ -121,7 +121,7 @@ public abstract class JavaPlugin extends PluginBase { +@@ -126,7 +126,7 @@ public abstract class JavaPlugin extends PluginBase { * @return File containing this plugin */ @NotNull @@ -110,7 +110,7 @@ index 301e82369603f3dd6e6c1bd380da4bacacd7ef6c..7573bda5d8a409d82bcd4baf77cff8df + // Yatopia end } diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 90953bfc81168068a281be4d2d3942d5e7dd69ff..74c01f29ac3d0a8fb5c047f1dea54d77425ce0a4 100644 +index 12449e18180d604e9cbbc744da74a8b222a18e1f..b7e94298f8d29d1a2ad0b7b79e4e601e51699e93 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -323,4 +323,13 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm diff --git a/patches/server/0001-pufferfish-Server-Changes-commit-f5fa99a04ddcc3424bb.patch b/patches/server/0001-pufferfish-Server-Changes-commit-f5fa99a04ddcc3424bb.patch index a49433ef..51dde210 100644 --- a/patches/server/0001-pufferfish-Server-Changes-commit-f5fa99a04ddcc3424bb.patch +++ b/patches/server/0001-pufferfish-Server-Changes-commit-f5fa99a04ddcc3424bb.patch @@ -2303,7 +2303,7 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..a27ee205d13dda890646ebf451076f38 } } diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java -index 1ccf71be865af4d3c5ab8f4323a228a947e0bf3f..3f3f8443563e4ca6c7fb236e7a98eaae3be3b43e 100644 +index 850f75172e9efa72cabb8e5bd124b96a0b1a945f..3db1de70c76e1427e257d988d1a7f26e986b5617 100644 --- a/src/main/java/io/papermc/paper/util/MCUtil.java +++ b/src/main/java/io/papermc/paper/util/MCUtil.java @@ -212,7 +212,7 @@ public final class MCUtil { @@ -2329,7 +2329,7 @@ index ba12919c3f9aec34a9e64993b143ae92be5eb172..9efeab9078e2d08903e482718b840797 } else { this.lastTimeStamp = body.timeStamp(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 90ae7e8c81f6a9ede8aeaeec3bf784023522cefc..cefc05ddb198bff00924f038b39195a5b9ccb05d 100644 +index d06185566b447c432d4dc2e3ba04d121bcdbc71b..3f77a3fac2db453b9036597e4fdfee20a574b2b8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0.0D) { if (k1 > 0) { diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index edc723ea5ca3a325106e7af38c60dbf9f0f5fb77..ab6cd363231a668c9b16df825a72d3205746ee49 100644 +index 09e8445a3f8c6b3ebc852a75a9a25b41a51ba659..dc11683ee4d8a6b7a1c42bcae36dc6e8105cd994 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -305,6 +305,8 @@ public class EntityType implements FeatureElement, EntityTypeT @@ -2897,10 +2897,10 @@ index edc723ea5ca3a325106e7af38c60dbf9f0f5fb77..ab6cd363231a668c9b16df825a72d320 private String descriptionId; @Nullable diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6071451339080bbdd98fb634791a56988984c8bc..5641bc7f50cef7819ddaeb76a4a4f9c80f473d31 100644 +index 6523795e715e5d472739e9bc6433143115c3de8f..317ff325f0a30d9ed83d3049cf96c53838c050ee 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; +@@ -141,7 +141,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; import org.bukkit.event.player.PlayerItemConsumeEvent; // CraftBukkit end @@ -2908,7 +2908,7 @@ index 6071451339080bbdd98fb634791a56988984c8bc..5641bc7f50cef7819ddaeb76a4a4f9c8 public abstract class LivingEntity extends Entity implements Attackable { -@@ -413,7 +412,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -412,7 +411,7 @@ public abstract class LivingEntity extends Entity implements Attackable { boolean flag = this instanceof net.minecraft.world.entity.player.Player; if (!this.level().isClientSide) { @@ -2937,7 +2937,7 @@ index 6071451339080bbdd98fb634791a56988984c8bc..5641bc7f50cef7819ddaeb76a4a4f9c8 @Override public boolean hurt(DamageSource source, float amount) { if (this.isInvulnerableTo(source)) { -@@ -2002,6 +2014,20 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2003,6 +2015,20 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.lastClimbablePos; } @@ -2959,7 +2959,7 @@ index 6071451339080bbdd98fb634791a56988984c8bc..5641bc7f50cef7819ddaeb76a4a4f9c8 if (this.isSpectator()) { return false; diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 24629412d2b4acaa81788ce70412b03387cc777c..a181a298334212847166409a2121476ba5871cb2 100644 +index 209090870e1a4aa2f59cfa2e29419dbcc9665635..195c86a52b1757c7aadf45babc52bfef58de1dc3 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -221,14 +221,16 @@ public abstract class Mob extends LivingEntity implements Targeting { @@ -3520,10 +3520,10 @@ index 27b0a79f7a7c47047216aae42944bac2a2151181..a097cfc528f709c80575f35483b68783 autorecipestackmanager.initialize(this); // Paper - better exact choice recipes int i = 0; diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 8f437225d2a4e08ca47873cd42277d9f0f9f5529..c10efc14ca83f07b27a2f12776ab2fd2a953c5a1 100644 +index 19f23a6c8fb5c02843c27fb8a242ec9d0d1b538b..fe063e4c3ff0b20f3d0c2c92eebdaf0101bac7d7 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -211,6 +211,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -206,6 +206,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { // Paper end - Use getChunkIfLoadedImmediately public abstract ResourceKey getTypeKey(); @@ -3532,7 +3532,7 @@ index 8f437225d2a4e08ca47873cd42277d9f0f9f5529..c10efc14ca83f07b27a2f12776ab2fd2 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, java.util.concurrent.Executor executor) { // 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 -@@ -1313,14 +1315,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1308,13 +1310,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { try { tickConsumer.accept(entity); MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick @@ -3542,15 +3542,13 @@ index 8f437225d2a4e08ca47873cd42277d9f0f9f5529..c10efc14ca83f07b27a2f12776ab2fd2 // Paper start - Prevent block entity and entity crashes final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ()); MinecraftServer.LOGGER.error(msg, throwable); - getCraftServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable))); // Paper - ServerExceptionEvent + getCraftServer().getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerInternalException(msg, throwable))); // Paper - ServerExceptionEvent - entity.discard(); -- // Paper end - Prevent block entity and entity crashes + entity.discard(); // Pufferfish - diff on change ServerLevel.tick -+ // Paper end + // Paper end - Prevent block entity and entity crashes } } - // Paper start - Option to prevent armor stands from doing entity lookups -@@ -1793,6 +1795,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1788,6 +1790,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } public ProfilerFiller getProfiler() { @@ -3559,10 +3557,10 @@ index 8f437225d2a4e08ca47873cd42277d9f0f9f5529..c10efc14ca83f07b27a2f12776ab2fd2 } diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 17e9f3a30e287faf210e08dc7eb177a70f049f43..96fc603c2fccc1d9610248b2116d35696bc65e4e 100644 +index da7489986848316fed029b71d1bc4e1248c9c9a8..661acdf4b1f33d150b0caf179e925d3162d7be35 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -@@ -429,12 +429,12 @@ public final class NaturalSpawner { +@@ -425,12 +425,12 @@ public final class NaturalSpawner { } } @@ -4094,10 +4092,10 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7 @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 34cd96dba5f11e64d7c90f4246b513b0ea943aa6..970b25f6064da694b076a08a8bbcc01e03d354d8 100644 +index 14d3986ae6ec721f07dc82b37d62d3bea484ad15..006b92521be9f24deccdae06b787746a004a6e42 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1120,6 +1120,11 @@ public final class CraftServer implements Server { +@@ -1125,6 +1125,11 @@ public final class CraftServer implements Server { plugin.getPluginMeta().getDisplayName(), "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies." )); @@ -4122,7 +4120,7 @@ index 96d772eb02f79f8c478f5e6f065e387aa7665b18..c5ce412f321b8b4f31cc042893659e21 } } diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java b/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java -index d96399e9bf1a58db5a4a22e58abb99e7660e0694..eb19f679ee498e51d02fe9a961cf02699cf75848 100644 +index 66bdac50130f523f9dc4379b103b7a469f9ca36b..ef780e0566dbac07da88ba26dc595b49c8ff5ab3 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/MinecraftInternalPlugin.java @@ -22,7 +22,8 @@ public class MinecraftInternalPlugin extends PluginBase { diff --git a/patches/server/0002-purpur-Server-Changes-commit-fa3166a24d0dd49f41eb025.patch b/patches/server/0002-purpur-Server-Changes-commit-fa3166a24d0dd49f41eb025.patch index c6dcc5cf..998567dd 100644 --- a/patches/server/0002-purpur-Server-Changes-commit-fa3166a24d0dd49f41eb025.patch +++ b/patches/server/0002-purpur-Server-Changes-commit-fa3166a24d0dd49f41eb025.patch @@ -82,7 +82,7 @@ index b7f338e982d0dcab99137ab6dc200b82ac6b7cba..32f355b1b33cf2b7b7a276fb0fd98314 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index cefc05ddb198bff00924f038b39195a5b9ccb05d..e8b77389e8766baabbe6c4ccb1befd95c388fc03 100644 +index 3f77a3fac2db453b9036597e4fdfee20a574b2b8..14d7deff0321890d29f5615bc5384e50b45da37e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -308,6 +308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 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, java.util.concurrent.Executor executor) { // 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 this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config @@ -265,7 +265,7 @@ index c10efc14ca83f07b27a2f12776ab2fd2a953c5a1..b34ec447a95e852fcc2cc3e8e2a890dd this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 979a8f472f866130a3abb10f535df757eaa50c20..b4af974854ba9dfd52f3d0c2eca984c01a9ab892 100644 +index 927c7ea03560be0c86884cec70ee8e408e66cb07..86e137a2e55b43c65b45698b7c0cb797898e54d7 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java @@ -206,11 +206,18 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C @@ -315,10 +315,10 @@ index 979a8f472f866130a3abb10f535df757eaa50c20..b4af974854ba9dfd52f3d0c2eca984c0 public CompoundTag getUpdateTag() { return this.saveWithoutMetadata(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 970b25f6064da694b076a08a8bbcc01e03d354d8..e4d07599c2301bdaecd0e42b4a99081c74f23d37 100644 +index 006b92521be9f24deccdae06b787746a004a6e42..be0e7cde275255af45ec12725ba982f158656b07 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1037,6 +1037,7 @@ public final class CraftServer implements Server { +@@ -1042,6 +1042,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot this.console.paperConfigurations.reloadConfigs(this.console); @@ -326,7 +326,7 @@ index 970b25f6064da694b076a08a8bbcc01e03d354d8..e4d07599c2301bdaecd0e42b4a99081c for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) -@@ -1052,6 +1053,7 @@ public final class CraftServer implements Server { +@@ -1057,6 +1058,7 @@ public final class CraftServer implements Server { } } world.spigotConfig.init(); // Spigot @@ -334,7 +334,7 @@ index 970b25f6064da694b076a08a8bbcc01e03d354d8..e4d07599c2301bdaecd0e42b4a99081c } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1067,6 +1069,7 @@ public final class CraftServer implements Server { +@@ -1072,6 +1074,7 @@ public final class CraftServer implements Server { this.reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper @@ -342,7 +342,7 @@ index 970b25f6064da694b076a08a8bbcc01e03d354d8..e4d07599c2301bdaecd0e42b4a99081c this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -3001,6 +3004,18 @@ public final class CraftServer implements Server { +@@ -3006,6 +3009,18 @@ public final class CraftServer implements Server { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -361,7 +361,7 @@ index 970b25f6064da694b076a08a8bbcc01e03d354d8..e4d07599c2301bdaecd0e42b4a99081c @Override public void restart() { org.spigotmc.RestartCommand.restart(); -@@ -3232,4 +3247,11 @@ public final class CraftServer implements Server { +@@ -3237,4 +3252,11 @@ public final class CraftServer implements Server { } // Paper end diff --git a/patches/server/0014-lithium-HashedList.patch b/patches/server/0014-lithium-HashedList.patch index 092e6b55..3868d8e7 100644 --- a/patches/server/0014-lithium-HashedList.patch +++ b/patches/server/0014-lithium-HashedList.patch @@ -293,10 +293,10 @@ index 0000000000000000000000000000000000000000..2d79932dbd1fc386a94b8d6ea3526934 + } +} diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index b34ec447a95e852fcc2cc3e8e2a890ddc8e5ff47..888913eff1a62b7f3b689ba64ce5630a20737897 100644 +index dd35f4838fde1a5f2501549e18e60b4becba9a3b..40ad0f5d43e08c640433205421948c1ceed3a00f 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -120,9 +120,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -115,9 +115,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public static final int TICKS_PER_DAY = 24000; public static final int MAX_ENTITY_SPAWN_Y = 20000000; public static final int MIN_ENTITY_SPAWN_Y = -20000000; diff --git a/patches/server/0015-lithium-cached_hashcode.patch b/patches/server/0015-lithium-cached_hashcode.patch index 54add35c..e581cc7a 100644 --- a/patches/server/0015-lithium-cached_hashcode.patch +++ b/patches/server/0015-lithium-cached_hashcode.patch @@ -6,10 +6,10 @@ Subject: [PATCH] lithium: cached_hashcode Original code licensed under GNU Lesser General Public License v3.0 and created for the lithium project: https://github.com/CaffeineMC/lithium-fabric/ diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index 73d6f881a7d4d8ff96040d34ac502e5b0937d577..2653798bc5454dccf97e73c39514394eb2c3f1c8 100644 +index 22036ed3ea0629bc12981a8d91a03e55cc2117d6..fb82f03c68ddd8b9ac6350699d83000ac8c5ddba 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java -@@ -614,11 +614,18 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -615,11 +615,18 @@ public class Block extends BlockBehaviour implements ItemLike { private final BlockState first; private final BlockState second; private final Direction direction; @@ -28,7 +28,7 @@ index 73d6f881a7d4d8ff96040d34ac502e5b0937d577..2653798bc5454dccf97e73c39514394e } public boolean equals(Object object) { -@@ -634,11 +641,7 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -635,11 +642,7 @@ public class Block extends BlockBehaviour implements ItemLike { } public int hashCode() { diff --git a/patches/server/0019-lithium-entity.fast_hand_swing.patch b/patches/server/0019-lithium-entity.fast_hand_swing.patch index bda2a96a0..e52b5ace 100644 --- a/patches/server/0019-lithium-entity.fast_hand_swing.patch +++ b/patches/server/0019-lithium-entity.fast_hand_swing.patch @@ -6,10 +6,10 @@ Subject: [PATCH] lithium: entity.fast_hand_swing Original code licensed under GNU Lesser General Public License v3.0 and created for the lithium project: https://github.com/CaffeineMC/lithium-fabric/ diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5641bc7f50cef7819ddaeb76a4a4f9c80f473d31..b649cc058d345162127735d291902f9015d5242a 100644 +index 317ff325f0a30d9ed83d3049cf96c53838c050ee..e1ce0cb80e77aa5fd8641ce3fca1b3cfd02212ef 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2538,6 +2538,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2539,6 +2539,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } protected void updateSwingTime() {