From e85e5ebc2e37dd6e6bdcb61fb41c8af9be6c61de Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 9 Jan 2022 00:27:01 -0600 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@eb48ada Merge chunk task urgent executor thread into the worker queue PaperMC/Paper@d9fb602 Expose vanilla BiomeProvider from WorldInfo (#7295) PaperMC/Paper@7d7ae7b Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7246) --- gradle.properties | 2 +- .../0001-Pufferfish-Server-Changes.patch | 42 +++++++++---------- patches/server/0006-Ridables.patch | 32 +++++++------- patches/server/0011-AFK-API.patch | 10 ++--- .../0014-LivingEntity-safeFallDistance.patch | 4 +- ...able-loot-drops-on-death-by-cramming.patch | 4 +- ...0049-Fix-the-dead-lagging-the-server.patch | 6 +-- ...Add-player-death-exp-control-options.patch | 4 +- ...urable-void-damage-height-and-damage.patch | 6 +-- .../0067-Implement-elytra-settings.patch | 4 +- patches/server/0081-Squid-EAR-immunity.patch | 4 +- .../0085-Totems-work-in-inventory.patch | 4 +- patches/server/0104-Stonecutter-damage.patch | 6 +-- ...iefing-bypass-to-everything-affected.patch | 8 ++-- .../server/0142-Dont-run-with-scissors.patch | 4 +- patches/server/0143-One-Punch-Man.patch | 4 +- ...nge-multiplier-critical-damage-value.patch | 4 +- ...187-API-for-any-mob-to-burn-daylight.patch | 8 ++-- .../server/0192-Flying-Fall-Damage-API.patch | 4 +- ...ing-food-fills-hunger-bar-completely.patch | 4 +- .../0212-Player-ridable-in-water-option.patch | 4 +- .../0216-Toggle-for-kinetic-damage.patch | 4 +- 22 files changed, 84 insertions(+), 88 deletions(-) diff --git a/gradle.properties b/gradle.properties index 490723b6a..82517075f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT mcVersion = 1.18.1 packageVersion = 1_18_R1 -paperCommit = 5ccd3050ed1dbb86ba15388ebaccfa85bf43df0d +paperCommit = 7d7ae7b8817077603758d4f78e275f5cc2052337 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 9887377df..b34f7cfce 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Initial Source -Date: Fri, 16 Jul 2021 17:11:36 -0500 +From: Kevin Raneri +Date: Wed, 3 Feb 2021 23:02:38 -0600 Subject: [PATCH] Pufferfish Server Changes Pufferfish @@ -99,7 +99,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..f2fe6ea3719ff8b2913b7a3a939d7a5b metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 1d3cc8836d2ccbec4a8660f86501be35c76e8b0b..2a19037d3ad734d1cf746d02b72926dd702fd23a 100644 +index 61ea1c9881ea30c05580044af9496a65fe95d94e..8d205a841c2d77dd57e1f2d189686f6f7426896c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -232,6 +232,15 @@ public class PaperConfig { @@ -2136,7 +2136,7 @@ index b61abf227a04b4565c2525e5f469db30c3a545a5..f99d189f461921d37581e2fc1382af60 public static long getCoordinateKey(final ChunkPos pair) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 481a5dbad82f3f8dd5b1bf8ab207d82ec73d5bbd..1e7ae166a1d53fce28297e2eaebd11ec28a57a55 100644 +index c4e8e6af67b57406012612b617a7dcaa6e391d09..5025b0b47e980b3f28dea9535c7dbc273753bb96 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -310,6 +310,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop getBrain() { -- return super.getBrain(); -+ return (Brain) super.getBrain(); // Airplane - decompile fix +@@ -126,9 +126,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { + return (Brain) super.getBrain(); // Paper - decompile fix } + private int behaviorTick; // Pufferfish @@ -3083,7 +3079,7 @@ index c5b9c0c650df5f4b7e3d2a431dc900e210104dea..17b4185704abfd47832941d02d605007 this.level.getProfiler().pop(); HoglinAi.updateActivity(this); diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index 8a2c2b4bd603aae37055abd058feb7ee759078ce..d850f1f57fc7560738f7bd82b37ec888e8e9301c 100644 +index f65d32245556e2acab927a29626749edea980f0a..16116a4f907ff691646a3e98dd8e25e0f26c3c49 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -288,9 +288,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @@ -3530,7 +3526,7 @@ index 4247dcb003626535dbb997f48ad9f61380bd17e9..90aa1d75b5c23e5ee27ceae9f6ef90de } diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 302803aa25b713cb087bdb2991cb0803dfe6005b..58bdbd1ad4e87d5e16d23ae437bd231394da7dfc 100644 +index c6bddf5e08376f1f254a27fc38647587eefcb00a..4ae9717b9ee77b3c28282e6560fc42081b6188ae 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -431,12 +431,12 @@ public final class NaturalSpawner { @@ -4103,7 +4099,7 @@ index e387de8adc480eac27b58b6f3f0d331ffc4382f1..6dba9d6bb7b81fe176cc0fabbb60b554 @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ba7023e7ca5d29375ff53c2951892138d155f69f..041ebfefca8f944f457a269f0e0b450b21949e73 100644 +index 54e8f0f367645f3aa8af5b1cb69c39c0cec9381f..868e148e6a8cd85ef89b79ad539dd5f3bce0a7c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -254,7 +254,7 @@ import javax.annotation.Nullable; // Paper @@ -4215,7 +4211,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..80553face9c70c2a3d897681e7761df8 if (stream != null) { diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 1732e753ea7748a66abecafb2136f93383f5ec4e..2eb9bc34afdc26bed21bc9d3e97f636cfc97f166 100644 +index 54a55cc05776af8de63b492bbda58182bb4c3726..8d3147b48eff5418f452eb1449639316399942ee 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -38,6 +38,10 @@ import co.aikar.timings.MinecraftTimings; @@ -4229,7 +4225,7 @@ index 1732e753ea7748a66abecafb2136f93383f5ec4e..2eb9bc34afdc26bed21bc9d3e97f636c public class ActivationRange { -@@ -211,6 +215,21 @@ public class ActivationRange +@@ -215,6 +219,21 @@ public class ActivationRange for (int i = 0; i < entities.size(); i++) { Entity entity = entities.get(i); ActivationRange.activateEntity(entity); @@ -4251,7 +4247,7 @@ index 1732e753ea7748a66abecafb2136f93383f5ec4e..2eb9bc34afdc26bed21bc9d3e97f636c } // Paper end } -@@ -227,12 +246,12 @@ public class ActivationRange +@@ -231,12 +250,12 @@ public class ActivationRange if ( MinecraftServer.currentTick > entity.activatedTick ) { if ( entity.defaultActivationState ) @@ -4266,7 +4262,7 @@ index 1732e753ea7748a66abecafb2136f93383f5ec4e..2eb9bc34afdc26bed21bc9d3e97f636c entity.activatedTick = MinecraftServer.currentTick; } } -@@ -280,7 +299,7 @@ public class ActivationRange +@@ -284,7 +303,7 @@ public class ActivationRange if ( entity instanceof LivingEntity ) { LivingEntity living = (LivingEntity) entity; diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch index 7f3d87249..ebce75a94 100644 --- a/patches/server/0006-Ridables.patch +++ b/patches/server/0006-Ridables.patch @@ -22,7 +22,7 @@ index 14610e6144ec144ebbec6fb0945c67bb0ea86795..6833eb5dc7aa64bef1b3b38de5e282bd super(x, y, z); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f0e7f8d4eb632d7c7effcd3d85d67baf1bf9eb41..a8a711c96a38c3d1c9d9b86418d389d5fa81ca29 100644 +index 31950910c206a5ab21ef2c9bc7ea284bd3e45b54..54ce8f0b9219790f6317c3eb95b81cadd64ac9b7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1589,6 +1589,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c7229e120d601619d2ea869d7aa506fb3b78cde4..41c9033b3e4fc9574793f670df3bb90c395ac991 100644 +index 27791d82b3343f14ff99efd4aed2193ea276b852..07e602d4319095f7a805b930f6afe1b0251cc5b5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -211,6 +211,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -86,7 +86,7 @@ index f020ec3974c9d8de8afd42bb33065350365c4687..2d1897d84f7f1f6265a5c31ec2666af7 if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) { ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((LivingEntity) entity)); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 957407d5fa39445c63d621bd9eafb526bcbf6bce..905e54d53f7a209f538da1500df0d3dfa6e8c7ed 100644 +index 6beb31d68b5d1fc84e396a510a68a488771fcac3..b119a3ce2a0907617c5e1f1071d640c8d4262f5f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i @@ -192,7 +192,7 @@ index 645c1dc9bd09b135a641759c76ce8d957b9bd488..03adc3b746e05bb4b0514ba4a66c101b protected ParticleOptions getInkParticle() { return ParticleTypes.GLOW_SQUID_INK; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2c988e05299d530d483e21ab452de0a03e5bdcbd..46134547b26de59bb69c584df676bf09e756420e 100644 +index d4da096f22bd3c118304fb00c7b9763562b9c889..1a5587e25356a239ae6a8c219747fcd93491e741 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -216,9 +216,9 @@ public abstract class LivingEntity extends Entity { @@ -225,7 +225,7 @@ index 2c988e05299d530d483e21ab452de0a03e5bdcbd..46134547b26de59bb69c584df676bf09 @Override protected void checkFallDamage(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) { -@@ -2606,7 +2607,7 @@ public abstract class LivingEntity extends Entity { +@@ -2605,7 +2606,7 @@ public abstract class LivingEntity extends Entity { } protected long lastJumpTime = 0L; // Paper @@ -234,7 +234,7 @@ index 2c988e05299d530d483e21ab452de0a03e5bdcbd..46134547b26de59bb69c584df676bf09 double d0 = (double) this.getJumpPower() + this.getJumpBoostPower(); Vec3 vec3d = this.getDeltaMovement(); // Paper start -@@ -3348,8 +3349,10 @@ public abstract class LivingEntity extends Entity { +@@ -3347,8 +3348,10 @@ public abstract class LivingEntity extends Entity { this.pushEntities(); this.level.getProfiler().pop(); // Paper start @@ -247,7 +247,7 @@ index 2c988e05299d530d483e21ab452de0a03e5bdcbd..46134547b26de59bb69c584df676bf09 Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO); Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot()); io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone()); -@@ -3359,6 +3362,21 @@ public abstract class LivingEntity extends Entity { +@@ -3358,6 +3361,21 @@ public abstract class LivingEntity extends Entity { absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch()); } } @@ -270,7 +270,7 @@ index 2c988e05299d530d483e21ab452de0a03e5bdcbd..46134547b26de59bb69c584df676bf09 // Paper end if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 06e87f3564bfba17393f36d2188abfd2ee9ac650..ed1d5508d894f5d2f6e61899a2013cbe47fbbc73 100644 +index 35ff7abd8251b0af6c23fbb63804db632ec5b85d..cbb2f643c619c80d3bebcf1a8f066a87fc52d274 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -143,6 +143,8 @@ public abstract class Mob extends LivingEntity { @@ -4328,7 +4328,7 @@ index c1e0cf7d86d7b45cc4ca342d80f0dc3fe43b0bfd..2dec8be9b199e9bcf0970774afbd19a4 public void setPersistentAngerTarget(@Nullable UUID uuid) { this.persistentAngerTarget = uuid; diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index 17b4185704abfd47832941d02d60500707e8a530..84969aa36add3b261b377c6b139313b153af4c46 100644 +index fc43b1d5dcb53456bb24ae46ea08b97b14403c86..9e65970033249315b534441c80725683ce23ff0b 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -67,6 +67,18 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { @@ -4360,7 +4360,7 @@ index 17b4185704abfd47832941d02d60500707e8a530..84969aa36add3b261b377c6b139313b1 this.level.getProfiler().pop(); HoglinAi.updateActivity(this); diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index d850f1f57fc7560738f7bd82b37ec888e8e9301c..6d27e775cff2e70889ef3fc4646d46edb184fb71 100644 +index 16116a4f907ff691646a3e98dd8e25e0f26c3c49..347244dcdea7ed3bb15dad4c0c5019ae9a1de9d1 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -96,6 +96,18 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @@ -4523,7 +4523,7 @@ index 642279bb7e15db9f662094ffd6ded2e3c7af3fd6..ab648e7dafd78f414646cef96b422e87 this.setTradingPlayer(player); this.openTradingScreen(player, this.getDisplayName(), 1); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 570d2325997e2465a8e17803ea882bc07ca64c38..957808b534592fd50cac78d2209a38c37950cb22 100644 +index d85da02be7f1d494af8f2cc840c49073774f5f9c..a706ab000eba2d996862a73a3bd38f1971b31b82 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -191,6 +191,19 @@ public abstract class Player extends LivingEntity { @@ -4609,7 +4609,7 @@ index 69223b13e894d86d9529f2ef8b60a08a1f7a9267..c2581fb017f6579e59bd25e46b781aa9 + // Purpur end } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c667baa2da8222eb66344c8f1cc0fed416c4df01..7be3a8ead9fc634ce990b689ac2cd2ae805030ea 100644 +index 35cc150adf51f79e2fccef8b094c90554aafbee2..b6f2bae38781f16c46ad515f34d829074b58e70d 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -542,6 +542,15 @@ public class CraftEventFactory { @@ -4636,15 +4636,15 @@ index c667baa2da8222eb66344c8f1cc0fed416c4df01..7be3a8ead9fc634ce990b689ac2cd2ae } event.setCancelled(cancelled); -@@ -1056,6 +1066,7 @@ public class CraftEventFactory { - if (!event.isCancelled()) { - event.getEntity().setLastDamageCause(event); +@@ -1066,6 +1076,7 @@ public class CraftEventFactory { + } else { + entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled } + damager.getHandle().processClick(InteractionHand.MAIN_HAND); // Purpur return event; } -@@ -1115,6 +1126,7 @@ public class CraftEventFactory { +@@ -1125,6 +1136,7 @@ public class CraftEventFactory { EntityDamageEvent event; if (damager != null) { event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, critical); // Paper - add critical damage API diff --git a/patches/server/0011-AFK-API.patch b/patches/server/0011-AFK-API.patch index 352ad71ea..7c2992f7d 100644 --- a/patches/server/0011-AFK-API.patch +++ b/patches/server/0011-AFK-API.patch @@ -182,7 +182,7 @@ index e752c83df50fb9b670ecea2abc95426c2a009b6f..baa4f9026d31de92210300ecb8ee8c1b if (baseEntity == null) { if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 957808b534592fd50cac78d2209a38c37950cb22..aad9de4019015ca42ad5509886ca35315aeb30d9 100644 +index a706ab000eba2d996862a73a3bd38f1971b31b82..fd83ec264d2d2dabadd50a73065ba61544196bfa 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -194,6 +194,13 @@ public abstract class Player extends LivingEntity { @@ -305,13 +305,13 @@ index 373bdce6590564bd9de4a571a91bbf05e287ee08..27d70e8e29902fe4275200cf75082980 public boolean untamedTamablesAreRidable = true; public boolean useNightVisionWhenRiding = false; diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 2eb9bc34afdc26bed21bc9d3e97f636cfc97f166..e12ba58f3795c17694defa308ced50a19d2a37b9 100644 +index 8d3147b48eff5418f452eb1449639316399942ee..d3c84417596a56e38012f2d0cee4203a1b875ac2 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java -@@ -199,6 +199,7 @@ public class ActivationRange - { +@@ -203,6 +203,7 @@ public class ActivationRange + continue; + } - player.activatedTick = MinecraftServer.currentTick; + if (!player.level.purpurConfig.idleTimeoutTickNearbyEntities && player.isAfk()) continue; // Purpur ActivationRange.maxBB = player.getBoundingBox().inflate( maxRange, 256, maxRange ); ActivationType.MISC.boundingBox = player.getBoundingBox().inflate( miscActivationRange, 256, miscActivationRange ); diff --git a/patches/server/0014-LivingEntity-safeFallDistance.patch b/patches/server/0014-LivingEntity-safeFallDistance.patch index 21c93a3db..4f19517f8 100644 --- a/patches/server/0014-LivingEntity-safeFallDistance.patch +++ b/patches/server/0014-LivingEntity-safeFallDistance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index dac5e52f2d86a9f4874cbaa2fdd6775d4b0566c1..6418809533a1847967e5cd18e70d3586bc79d979 100644 +index 85a6003ecadfabf47c06405f5b85bb71b5cd1e34..9414424cb9b9bf1a6ffee2dbb38423055fcc3e9c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -251,6 +251,7 @@ public abstract class LivingEntity extends Entity { @@ -27,7 +27,7 @@ index dac5e52f2d86a9f4874cbaa2fdd6775d4b0566c1..6418809533a1847967e5cd18e70d3586 if (!landedState.isAir()) { double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D); -@@ -1926,7 +1927,7 @@ public abstract class LivingEntity extends Entity { +@@ -1925,7 +1926,7 @@ public abstract class LivingEntity extends Entity { MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP); float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1); diff --git a/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch index 8a7a62a67..de2b74b5d 100644 --- a/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6418809533a1847967e5cd18e70d3586bc79d979..1988ffd4778d00d62fe334479de50cd4ef094f31 100644 +index 9414424cb9b9bf1a6ffee2dbb38423055fcc3e9c..3ccac5096d83e21b19dd610a62f37ba21208dac6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1719,10 +1719,12 @@ public abstract class LivingEntity extends Entity { +@@ -1718,10 +1718,12 @@ public abstract class LivingEntity extends Entity { this.dropEquipment(); // CraftBukkit - from below if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { diff --git a/patches/server/0049-Fix-the-dead-lagging-the-server.patch b/patches/server/0049-Fix-the-dead-lagging-the-server.patch index 0cda26bc4..f04064166 100644 --- a/patches/server/0049-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0049-Fix-the-dead-lagging-the-server.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 146b3d064829d38901c34e639d01d8d02b05f495..bc1139194a3cb087eb8fc92e85491ae44ee461c3 100644 +index 3c8119aa55aa1fcd59e8b0d545d474bd100c674e..3fcc8349d5afda0384e09641007b3731010a2d1d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1763,6 +1763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i @@ -17,10 +17,10 @@ index 146b3d064829d38901c34e639d01d8d02b05f495..bc1139194a3cb087eb8fc92e85491ae4 public void absMoveTo(double x, double y, double z) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1988ffd4778d00d62fe334479de50cd4ef094f31..3e472507d03ad86001fbd19a089a14bc7abd3cf7 100644 +index 3ccac5096d83e21b19dd610a62f37ba21208dac6..8d2f0a07792d88c8f53c87333d32e67502b4e39f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2932,7 +2932,7 @@ public abstract class LivingEntity extends Entity { +@@ -2931,7 +2931,7 @@ public abstract class LivingEntity extends Entity { } } diff --git a/patches/server/0060-Add-player-death-exp-control-options.patch b/patches/server/0060-Add-player-death-exp-control-options.patch index 5f60d4139..8b33263fb 100644 --- a/patches/server/0060-Add-player-death-exp-control-options.patch +++ b/patches/server/0060-Add-player-death-exp-control-options.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add player death exp control options diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index aad9de4019015ca42ad5509886ca35315aeb30d9..7518b7f7378eba01d12224db6264b6bcc1254432 100644 +index fd83ec264d2d2dabadd50a73065ba61544196bfa..ad41bfb05122086aafc290c2b816a28bfc7d8e7e 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1909,9 +1909,18 @@ public abstract class Player extends LivingEntity { +@@ -1908,9 +1908,18 @@ public abstract class Player extends LivingEntity { @Override protected int getExperienceReward(Player player) { if (!this.level.getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) { diff --git a/patches/server/0061-Configurable-void-damage-height-and-damage.patch b/patches/server/0061-Configurable-void-damage-height-and-damage.patch index 06937db42..d001d2d3f 100644 --- a/patches/server/0061-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0061-Configurable-void-damage-height-and-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bc1139194a3cb087eb8fc92e85491ae44ee461c3..347a30897d82b6b6c789e8f207ed1a98c09f5ed3 100644 +index 3fcc8349d5afda0384e09641007b3731010a2d1d..45156eb5e99c7f723fbc5dccaae54f7fad03884c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -809,7 +809,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i @@ -18,10 +18,10 @@ index bc1139194a3cb087eb8fc92e85491ae44ee461c3..347a30897d82b6b6c789e8f207ed1a98 && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) { // Paper end diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3e472507d03ad86001fbd19a089a14bc7abd3cf7..b4a5fdba6e47ae482a445deb5f90dbde2a8f5dec 100644 +index 8d2f0a07792d88c8f53c87333d32e67502b4e39f..195efa0326e2943a7c1c9190de76f61f7f6e3d28 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2424,7 +2424,7 @@ public abstract class LivingEntity extends Entity { +@@ -2423,7 +2423,7 @@ public abstract class LivingEntity extends Entity { @Override protected void outOfWorld() { diff --git a/patches/server/0067-Implement-elytra-settings.patch b/patches/server/0067-Implement-elytra-settings.patch index 323a28f3b..5caf77f09 100644 --- a/patches/server/0067-Implement-elytra-settings.patch +++ b/patches/server/0067-Implement-elytra-settings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b4a5fdba6e47ae482a445deb5f90dbde2a8f5dec..38c9aa1e1f717cd9b596db85e9234d2651ac0de0 100644 +index 195efa0326e2943a7c1c9190de76f61f7f6e3d28..5a42b378012a4de689c6d63d5233bfa6df251917 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3409,7 +3409,16 @@ public abstract class LivingEntity extends Entity { +@@ -3408,7 +3408,16 @@ public abstract class LivingEntity extends Entity { int j = i / 10; if (j % 2 == 0) { diff --git a/patches/server/0081-Squid-EAR-immunity.patch b/patches/server/0081-Squid-EAR-immunity.patch index 575c3051b..c216b3edc 100644 --- a/patches/server/0081-Squid-EAR-immunity.patch +++ b/patches/server/0081-Squid-EAR-immunity.patch @@ -25,7 +25,7 @@ index b5d48e3979361e1b6407a1dcf0f5271542273974..71eef6cc623db385db98d3fe98ea6574 public boolean spiderRidable = false; diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index e12ba58f3795c17694defa308ced50a19d2a37b9..49b9c0db6693c95bae8f63e97f50720580dc59da 100644 +index d3c84417596a56e38012f2d0cee4203a1b875ac2..b72234ede04005c8d2be1e339f5bcebd7790bb61 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -15,6 +15,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature; @@ -36,7 +36,7 @@ index e12ba58f3795c17694defa308ced50a19d2a37b9..49b9c0db6693c95bae8f63e97f507205 import net.minecraft.world.entity.animal.WaterAnimal; import net.minecraft.world.entity.animal.horse.Llama; import net.minecraft.world.entity.boss.EnderDragonPart; -@@ -381,6 +382,7 @@ public class ActivationRange +@@ -385,6 +386,7 @@ public class ActivationRange */ public static boolean checkIfActive(Entity entity) { diff --git a/patches/server/0085-Totems-work-in-inventory.patch b/patches/server/0085-Totems-work-in-inventory.patch index 2c3b6e436..5767a0d37 100644 --- a/patches/server/0085-Totems-work-in-inventory.patch +++ b/patches/server/0085-Totems-work-in-inventory.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2950a9556fd474b659d66c1fc4d5e6e451ad9fda..1bc7b7f016b0f58bad34dfd58e506967d61099e5 100644 +index 72341e3907ea19e16b5f09a7e7b38aac73d1ad50..66628b9c301da2fee3afe42ed321a2c31fc63d2b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1520,6 +1520,19 @@ public abstract class LivingEntity extends Entity { +@@ -1519,6 +1519,19 @@ public abstract class LivingEntity extends Entity { } } diff --git a/patches/server/0104-Stonecutter-damage.patch b/patches/server/0104-Stonecutter-damage.patch index 18c0659b1..99cd825e9 100644 --- a/patches/server/0104-Stonecutter-damage.patch +++ b/patches/server/0104-Stonecutter-damage.patch @@ -24,7 +24,7 @@ index 19d6165f266fcc39bc3533042109ef1b725ecb77..32bf8264fecb8873f3ffa0e57a4bb48b private boolean bypassArmor; private boolean bypassInvul; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4d9ba5bfd3632c5402badde37996b6ae8c4dea5b..02a2496539813b1d34b9e5ccac0590e6b58c17b5 100644 +index 134be4b6a485f76c6f20361de5ef06121f21baab..29b27f0ce54ec8f72981d07d08ffacbe1aab60f8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1051,7 +1051,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i @@ -80,10 +80,10 @@ index 737d0405a195d322ffe9a57acadb9f6d645c03b8..d7bdf3c2a5b99ff7adb3e960ff356a1f } else if (blockState.is(Blocks.HONEY_BLOCK)) { return BlockPathTypes.STICKY_HONEY; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7be3a8ead9fc634ce990b689ac2cd2ae805030ea..159924aefae87f69492ecc0c93a638758f6632a5 100644 +index b6f2bae38781f16c46ad515f34d829074b58e70d..e1753ed5f7f72a4861666cd7929ab52b7891d5f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1033,6 +1033,10 @@ public class CraftEventFactory { +@@ -1039,6 +1039,10 @@ public class CraftEventFactory { cause = DamageCause.MAGIC; } else if (source == DamageSource.IN_FIRE) { cause = DamageCause.FIRE; diff --git a/patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch index ff6e122dc..5d9569b76 100644 --- a/patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1bc7b7f016b0f58bad34dfd58e506967d61099e5..f86e65530182685517e12ea609a4bdcd8c493161 100644 +index 66628b9c301da2fee3afe42ed321a2c31fc63d2b..cb825b7edfcee31ba431e5f166ec9008ea9f2060 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1691,7 +1691,7 @@ public abstract class LivingEntity extends Entity { +@@ -1690,7 +1690,7 @@ public abstract class LivingEntity extends Entity { boolean flag = false; if (this.dead && adversary instanceof WitherBoss) { // Paper @@ -18,7 +18,7 @@ index 1bc7b7f016b0f58bad34dfd58e506967d61099e5..f86e65530182685517e12ea609a4bdcd BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState(); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index a3b2d756df150e7be20983fa865b0743de4c91e7..c83107cf47eb1aad1bc445661a2703d468155642 100644 +index 0e7fcda7cd4d9008ba3aeb15a50301b8dcb8ba24..fa23e24708f4d9e1f50e54cda76113a9a7695c0a 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -666,7 +666,7 @@ public abstract class Mob extends LivingEntity { @@ -249,7 +249,7 @@ index cd26c22664fb23457f99fe04607146c8c6545307..5057b9b6ad2c47a11ca11b281393ccf6 BlockPos blockposition = (new BlockPos(this.mob.getX(), this.mob.getY() + 0.5D, this.mob.getZ())).relative(this.selectedDirection); BlockState iblockdata = this.mob.level.getBlockState(blockposition); diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index 862534112722a482cd5f69b346b69f3d46086359..badf1fc1a5f5ca0086b45876171a18cad00896b7 100644 +index 70be752683291c34248ba7bafa42034f22fec9a9..107afea31c75f11e82672def7300d277dec7af1d 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -407,7 +407,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento diff --git a/patches/server/0142-Dont-run-with-scissors.patch b/patches/server/0142-Dont-run-with-scissors.patch index 43c6c6c5c..41ba223ed 100644 --- a/patches/server/0142-Dont-run-with-scissors.patch +++ b/patches/server/0142-Dont-run-with-scissors.patch @@ -53,10 +53,10 @@ index 32bf8264fecb8873f3ffa0e57a4bb48b5517fb77..0f56c60962b9c61c72d05edc7d9b10e9 private boolean damageHelmet; private boolean bypassArmor; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 159924aefae87f69492ecc0c93a638758f6632a5..990e3356d3ff26e14dfcc897a25b015454d6c8d7 100644 +index e1753ed5f7f72a4861666cd7929ab52b7891d5f0..8ccfbee93e98e20c07e733a42765a1a4eeb394fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1105,6 +1105,10 @@ public class CraftEventFactory { +@@ -1115,6 +1115,10 @@ public class CraftEventFactory { cause = DamageCause.FREEZE; } else if (source == DamageSource.GENERIC) { cause = DamageCause.CUSTOM; diff --git a/patches/server/0143-One-Punch-Man.patch b/patches/server/0143-One-Punch-Man.patch index cfeb20c03..2f18c8f5b 100644 --- a/patches/server/0143-One-Punch-Man.patch +++ b/patches/server/0143-One-Punch-Man.patch @@ -5,10 +5,10 @@ Subject: [PATCH] One Punch Man! diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f86e65530182685517e12ea609a4bdcd8c493161..2290038b18ccd2757e305870d0a4a39cf674c713 100644 +index cb825b7edfcee31ba431e5f166ec9008ea9f2060..e00c2b211cc3bf55f58039f4a0872ea59122603b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2159,6 +2159,20 @@ public abstract class LivingEntity extends Entity { +@@ -2158,6 +2158,20 @@ public abstract class LivingEntity extends Entity { ((ServerPlayer) damagesource.getEntity()).awardStat(Stats.DAMAGE_DEALT_ABSORBED, Math.round(f2 * 10.0F)); } diff --git a/patches/server/0181-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0181-Add-config-change-multiplier-critical-damage-value.patch index ada2bc48f..85361772c 100644 --- a/patches/server/0181-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0181-Add-config-change-multiplier-critical-damage-value.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add config change multiplier critical damage value diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index b1ca8265d2104168b64e560634f319c72103da55..9a8c08e34e70a0bc263186da8b703ac3c157b4d9 100644 +index 9716110e910ae3d73be54333050214cd53a885d3..2004f291610c0089aab92e863b439ca25bf77a47 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1255,7 +1255,7 @@ public abstract class Player extends LivingEntity { +@@ -1254,7 +1254,7 @@ public abstract class Player extends LivingEntity { flag2 = flag2 && !level.paperConfig.disablePlayerCrits; // Paper flag2 = flag2 && !this.isSprinting(); if (flag2) { diff --git a/patches/server/0187-API-for-any-mob-to-burn-daylight.patch b/patches/server/0187-API-for-any-mob-to-burn-daylight.patch index cfd8b01e4..042f5cf92 100644 --- a/patches/server/0187-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0187-API-for-any-mob-to-burn-daylight.patch @@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight Co-authored by: Encode42 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ffe4024267f432c9eba37a6712e444e55c69799d..1e4d6c36576ebfc9ff643d87d73ee6a908a06876 100644 +index c709099a06f6cb9313c7e99f3b66b463b31e751a..ffccf99ae6eb4a20104ce897cb9f1a9356dd23c7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4431,5 +4431,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i @@ -29,7 +29,7 @@ index ffe4024267f432c9eba37a6712e444e55c69799d..1e4d6c36576ebfc9ff643d87d73ee6a9 // Purpur end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b7d580fc174b69c23dbbc18e114f3d3119a8e9ea..bf01f496e2b89f6fbd44d845a12cdfaed41e5f13 100644 +index 26717a4172ef299a3b4ab4384f8c23dc853bb485..12517438b8b8366a37165cb057dfc040ec81fc3a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -261,6 +261,7 @@ public abstract class LivingEntity extends Entity { @@ -60,7 +60,7 @@ index b7d580fc174b69c23dbbc18e114f3d3119a8e9ea..bf01f496e2b89f6fbd44d845a12cdfae } // CraftBukkit start -@@ -3429,6 +3436,27 @@ public abstract class LivingEntity extends Entity { +@@ -3428,6 +3435,27 @@ public abstract class LivingEntity extends Entity { this.hurt(DamageSource.DROWN, 1.0F); } @@ -89,7 +89,7 @@ index b7d580fc174b69c23dbbc18e114f3d3119a8e9ea..bf01f496e2b89f6fbd44d845a12cdfae public boolean isSensitiveToWater() { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index c83107cf47eb1aad1bc445661a2703d468155642..6e57000706fa51cbde64a6c63d0da39e04b51826 100644 +index fa23e24708f4d9e1f50e54cda76113a9a7695c0a..e9aa614a7a93286e5077ffa43a8aebbaab6f4ac2 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1664,17 +1664,7 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0192-Flying-Fall-Damage-API.patch b/patches/server/0192-Flying-Fall-Damage-API.patch index a0d07560d..7feeae7d0 100644 --- a/patches/server/0192-Flying-Fall-Damage-API.patch +++ b/patches/server/0192-Flying-Fall-Damage-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 4252ff0201cbfbecc7b95ca86c1763dc5d88a4d7..535bc6d57d153a62f2cbf57747586de3d4c41b1f 100644 +index 2004f291610c0089aab92e863b439ca25bf77a47..f88d187dc16c8a0b997b6ee26bf17ea63c0b752a 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -180,6 +180,7 @@ public abstract class Player extends LivingEntity { @@ -16,7 +16,7 @@ index 4252ff0201cbfbecc7b95ca86c1763dc5d88a4d7..535bc6d57d153a62f2cbf57747586de3 // CraftBukkit start public boolean fauxSleeping; -@@ -1729,7 +1730,7 @@ public abstract class Player extends LivingEntity { +@@ -1728,7 +1729,7 @@ public abstract class Player extends LivingEntity { @Override public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) { diff --git a/patches/server/0194-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0194-Burp-after-eating-food-fills-hunger-bar-completely.patch index 33d3ad657..7de9904de 100644 --- a/patches/server/0194-Burp-after-eating-food-fills-hunger-bar-completely.patch +++ b/patches/server/0194-Burp-after-eating-food-fills-hunger-bar-completely.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Burp after eating food fills hunger bar completely diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 7a0bf9f054882e8f6ed7ba6b82940722216848de..05be92b70449eec2fe6661aab0cdbf89496fefac 100644 +index f88d187dc16c8a0b997b6ee26bf17ea63c0b752a..b9e02d997b2521d505379156561c4990fa02ff5f 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -193,6 +193,8 @@ public abstract class Player extends LivingEntity { @@ -30,7 +30,7 @@ index 7a0bf9f054882e8f6ed7ba6b82940722216848de..05be92b70449eec2fe6661aab0cdbf89 this.noPhysics = this.isSpectator(); if (this.isSpectator()) { this.onGround = false; -@@ -2298,7 +2306,7 @@ public abstract class Player extends LivingEntity { +@@ -2297,7 +2305,7 @@ public abstract class Player extends LivingEntity { public ItemStack eat(Level world, ItemStack stack) { this.getFoodData().eat(stack.getItem(), stack); this.awardStat(Stats.ITEM_USED.get(stack.getItem())); diff --git a/patches/server/0212-Player-ridable-in-water-option.patch b/patches/server/0212-Player-ridable-in-water-option.patch index 0edbde6dc..cbcea8b6d 100644 --- a/patches/server/0212-Player-ridable-in-water-option.patch +++ b/patches/server/0212-Player-ridable-in-water-option.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player ridable in water option diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index f254cd917eb9198e902b68f78127f9fc63fde7c7..d0e66f4e5afec947bf6331a7883dc840984f4069 100644 +index 41d163e35dc9d9e7732974b16891aa16f599973d..c8792fee068c13ae45f9eb936ef34fc5cae7ba57 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -2015,6 +2015,11 @@ public abstract class Player extends LivingEntity { +@@ -2014,6 +2014,11 @@ public abstract class Player extends LivingEntity { return this.inventory.armor; } diff --git a/patches/server/0216-Toggle-for-kinetic-damage.patch b/patches/server/0216-Toggle-for-kinetic-damage.patch index 8989ef608..201f21f21 100644 --- a/patches/server/0216-Toggle-for-kinetic-damage.patch +++ b/patches/server/0216-Toggle-for-kinetic-damage.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index bf01f496e2b89f6fbd44d845a12cdfaed41e5f13..dcadf213c929c693ee60666993288ef09988e62c 100644 +index 12517438b8b8366a37165cb057dfc040ec81fc3a..e44b0c3704ca6b7609f6638e43aa8abe1939bfd8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2818,7 +2818,11 @@ public abstract class LivingEntity extends Entity { +@@ -2817,7 +2817,11 @@ public abstract class LivingEntity extends Entity { if (f4 > 0.0F) { this.playSound(this.getFallDamageSound((int) f4), 1.0F, 1.0F);