From 5ad7f4bd90b8a09f5f174ef2318e9ddb1a3ab06f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 18 Feb 2022 20:06:35 -0600 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@2a4aef3 Mark ChatRender#render as ApiStatus.Override PaperMC/Paper@f5b9e07 Add GameEvent tags (#6439) PaperMC/Paper@b173c3e Use access transformers for player profile API (#7468) PaperMC/Paper@286bd1b 1.18 misc performance dev branch (#7368) PaperMC/Paper@5bb4549 Fix entity armor not showing on death animation (#7355) --- build.gradle.kts | 1 - gradle.properties | 2 +- patches/api/0005-Purpur-client-support.patch | 4 ++-- patches/api/0010-AFK-API.patch | 4 ++-- .../api/0017-Player-invulnerabilities.patch | 4 ++-- ...oc-warnings-missing-param-and-return.patch | 6 +++--- patches/api/0037-Flying-Fall-Damage-API.patch | 4 ++-- .../0001-Pufferfish-Server-Changes.patch | 18 ++++++++--------- patches/server/0002-Rebrand.patch | 6 +++--- patches/server/0003-Purpur-config-files.patch | 4 ++-- .../server/0004-Purpur-client-support.patch | 4 ++-- patches/server/0006-Ridables.patch | 20 +++++++++---------- patches/server/0011-AFK-API.patch | 4 ++-- .../server/0012-Bring-back-server-name.patch | 4 ++-- .../0013-Configurable-server-mod-name.patch | 4 ++-- .../0014-LivingEntity-safeFallDistance.patch | 4 ++-- patches/server/0015-Lagging-threshold.patch | 6 +++--- .../0018-Player-invulnerabilities.patch | 4 ++-- ...able-loot-drops-on-death-by-cramming.patch | 11 ++++++---- ...0049-Fix-the-dead-lagging-the-server.patch | 6 +++--- .../0056-Allow-leashing-villagers.patch | 4 ++-- ...urable-void-damage-height-and-damage.patch | 6 +++--- ...ispenser-curse-of-binding-protection.patch | 4 ++-- ...0066-Add-5-second-tps-average-in-tps.patch | 6 +++--- .../0067-Implement-elytra-settings.patch | 6 +++--- patches/server/0079-Entity-lifespan.patch | 4 ++-- .../0105-Configurable-daylight-cycle.patch | 6 +++--- ...16-Changeable-Mob-Left-Handed-Chance.patch | 4 ++-- ...ptimise-player-list-ticksSpread-out-.patch | 4 ++-- ...iefing-bypass-to-everything-affected.patch | 6 +++--- ...0134-Add-EntityTeleportHinderedEvent.patch | 4 ++-- patches/server/0143-One-Punch-Man.patch | 4 ++-- ...187-API-for-any-mob-to-burn-daylight.patch | 8 ++++---- .../server/0192-Flying-Fall-Damage-API.patch | 4 ++-- .../0216-Toggle-for-kinetic-damage.patch | 6 +++--- .../0227-Extended-OfflinePlayer-API.patch | 4 ++-- 36 files changed, 101 insertions(+), 99 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1b2f02cd3..1eefdbd63 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -67,7 +67,6 @@ paperweight { decompileRepo.set("https://files.minecraftforge.net/maven/") usePaperUpstream(providers.gradleProperty("paperCommit")) { - url.set(github("PurpurMC", "Paper")) withPaperPatcher { apiPatchDir.set(layout.projectDirectory.dir("patches/api")) apiOutputDir.set(layout.projectDirectory.dir("Purpur-API")) diff --git a/gradle.properties b/gradle.properties index 6458f75ea..17998a454 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 = b19e67928792d92035b17b1a62dba95fbe8c6c9e +paperCommit = 5bb4549f48bf823487f1cb697d8973afad2aa584 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0005-Purpur-client-support.patch b/patches/api/0005-Purpur-client-support.patch index c84540020..fbb8b8c22 100644 --- a/patches/api/0005-Purpur-client-support.patch +++ b/patches/api/0005-Purpur-client-support.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 131daee2b29f7016463a00ce7927dff7b0a1b1b4..6a3c22efa63133b8144b8a20e591c30ae00ab7d2 100644 +index 5c1b8f35f22ae10a17d78ece95c49de44f58976d..468938dc2589cca72266b33e49284ce8e9ba8854 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2652,4 +2652,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2668,4 +2668,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/api/0010-AFK-API.patch b/patches/api/0010-AFK-API.patch index cb044abc2..072244286 100644 --- a/patches/api/0010-AFK-API.patch +++ b/patches/api/0010-AFK-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 6a3c22efa63133b8144b8a20e591c30ae00ab7d2..75680d1b3bd7640ae9f72ec7b0b794689e7c2cb6 100644 +index 468938dc2589cca72266b33e49284ce8e9ba8854..ae1b74a9ecfb028761439476141069c9e2fa6f26 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2660,5 +2660,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2676,5 +2676,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return True if Player uses Purpur Client */ public boolean usesPurpurClient(); diff --git a/patches/api/0017-Player-invulnerabilities.patch b/patches/api/0017-Player-invulnerabilities.patch index 629d51a05..f25698222 100644 --- a/patches/api/0017-Player-invulnerabilities.patch +++ b/patches/api/0017-Player-invulnerabilities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 75680d1b3bd7640ae9f72ec7b0b794689e7c2cb6..b07e6709531595b7241ef54754f2450d4561c463 100644 +index ae1b74a9ecfb028761439476141069c9e2fa6f26..fa81050f3c16c5bf0ab4a7e1271e98a6f7a3ebfc 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2679,5 +2679,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2695,5 +2695,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Reset the idle timer back to 0 */ void resetIdleTimer(); diff --git a/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch index 27dcb9f36..f8d6ab982 100644 --- a/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch +++ b/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch @@ -924,10 +924,10 @@ index 1dcc2c8f4899da029af8b1c1b2ff1b5e368e82c1..c5f49f3f82fd259a1c795b59e83c3d9f NORMAL(false), diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b07e6709531595b7241ef54754f2450d4561c463..68fb6c2a92e27b42703c00139df7f88eafa74652 100644 +index fa81050f3c16c5bf0ab4a7e1271e98a6f7a3ebfc..621b8c31f0a326341ab1ad53afd79e7926ca7282 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2482,6 +2482,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2498,6 +2498,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void resetCooldown(); /** @@ -936,7 +936,7 @@ index b07e6709531595b7241ef54754f2450d4561c463..68fb6c2a92e27b42703c00139df7f88e * @return the client option value of the player */ @NotNull -@@ -2513,6 +2515,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2529,6 +2531,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM // Paper end // Spigot start diff --git a/patches/api/0037-Flying-Fall-Damage-API.patch b/patches/api/0037-Flying-Fall-Damage-API.patch index de0c87e07..f4cb1c73b 100644 --- a/patches/api/0037-Flying-Fall-Damage-API.patch +++ b/patches/api/0037-Flying-Fall-Damage-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 3383aab3f98f089425c9db10057533dff28cc8d4..6e95dbe19df37b67dfb497e0ac37bfeccdcbd38c 100644 +index c98a47dd5109a021b7a7a7d069285a80d302fccc..c0a2c64c6e15a5aa6e70a449b76a9fd0f2796555 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2705,5 +2705,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2721,5 +2721,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param invulnerableTicks Invulnerable ticks remaining */ void setSpawnInvulnerableTicks(int invulnerableTicks); diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index f4eaea5b0..e9eb6b648 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -111,7 +111,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 4a14eb59541347aa8e9504ac156e9b63d1bdfd69..499d5d5a35323571571911969cc9bac3b90cec99 100644 +index 153f07bac06093b43a1f5b0f8e1a46ffbe6407e5..638cffa552d804d5901e1d099691fdfa4c65a7a7 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 { @@ -2173,7 +2173,7 @@ index 7bddc7517356cc74104dcc5c7c55522a53f2596f..d6a57cdad2c92521a800cb18d060d9d6 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 887243394fc2578fbcfd3dd150921e221f2d8475..3ec35d19f63832ee465a54518219184a14bb08e2 100644 +index 1674deebbeab0995ed7acacf8052e1daf4d2a7bc..a31f8bf3f4183a7a02f58f2321dbeaf427017b1c 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 S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); -@@ -1713,7 +1715,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper @@ -34,7 +34,7 @@ index 596a130a94865806b0b2340d303b25fae71986b7..f7e76dc842ac226b94ba552ad412cf0d this.profiler.push(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 59d57108f38f38e03cd8b69a53c3e9d40179599a..2d2c1ac2c40605e9a6228c81e5e50a31a3e2c4af 100644 +index 740e1d7b299e78668bff5b176bbe54f478c73fd3..c0c180174a90bb007ea21f86b6713ce1df1fd8e1 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 { @@ -201,7 +201,7 @@ index 645c1dc9bd09b135a641759c76ce8d957b9bd488..912767ed261e44c0192c5a07e2c20261 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 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..d1b85bbb53912bacc42ffb8962e2c3fed1b33d26 100644 +index 6f98681ac54f575be047867a8c0b58e1dbd2a37d..eb9830104fb1c46ccce7b0f5e7c6ab66ecb6c809 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 { @@ -234,7 +234,7 @@ index 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..d1b85bbb53912bacc42ffb8962e2c3fe @Override protected void checkFallDamage(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) { -@@ -2604,7 +2605,7 @@ public abstract class LivingEntity extends Entity { +@@ -2613,7 +2614,7 @@ public abstract class LivingEntity extends Entity { } protected long lastJumpTime = 0L; // Paper @@ -243,7 +243,7 @@ index 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..d1b85bbb53912bacc42ffb8962e2c3fe double d0 = (double) this.getJumpPower() + this.getJumpBoostPower(); Vec3 vec3d = this.getDeltaMovement(); // Paper start -@@ -3346,8 +3347,10 @@ public abstract class LivingEntity extends Entity { +@@ -3355,8 +3356,10 @@ public abstract class LivingEntity extends Entity { this.pushEntities(); this.level.getProfiler().pop(); // Paper start @@ -256,7 +256,7 @@ index 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..d1b85bbb53912bacc42ffb8962e2c3fe 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()); -@@ -3357,6 +3360,21 @@ public abstract class LivingEntity extends Entity { +@@ -3366,6 +3369,21 @@ public abstract class LivingEntity extends Entity { absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch()); } } @@ -279,7 +279,7 @@ index 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..d1b85bbb53912bacc42ffb8962e2c3fe // 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 35ff7abd8251b0af6c23fbb63804db632ec5b85d..dcf788de63b819abc668cc6deba974af26a41f2e 100644 +index 73af374f4aa9e3e8f188434c21a5f1433cffc637..9956c5c69ee967c3cfab76d1dc31c9454ec61036 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -141,8 +141,8 @@ public abstract class Mob extends LivingEntity { @@ -293,7 +293,7 @@ index 35ff7abd8251b0af6c23fbb63804db632ec5b85d..dcf788de63b819abc668cc6deba974af this.jumpControl = new JumpControl(this); this.bodyRotationControl = this.createBodyControl(); this.navigation = this.createNavigation(world); -@@ -1306,7 +1306,7 @@ public abstract class Mob extends LivingEntity { +@@ -1310,7 +1310,7 @@ public abstract class Mob extends LivingEntity { protected void onOffspringSpawnedFromEgg(Player player, Mob child) {} protected InteractionResult mobInteract(Player player, InteractionHand hand) { @@ -302,7 +302,7 @@ index 35ff7abd8251b0af6c23fbb63804db632ec5b85d..dcf788de63b819abc668cc6deba974af } public boolean isWithinRestriction() { -@@ -1667,4 +1667,52 @@ public abstract class Mob extends LivingEntity { +@@ -1671,4 +1671,52 @@ public abstract class Mob extends LivingEntity { return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg); } diff --git a/patches/server/0011-AFK-API.patch b/patches/server/0011-AFK-API.patch index 134e31992..66228a800 100644 --- a/patches/server/0011-AFK-API.patch +++ b/patches/server/0011-AFK-API.patch @@ -213,7 +213,7 @@ index 1f4b72a0aca200b2e0860449c718e6e607d2fc47..e1dd8932594780b07db13f68efa117eb if (range < 0.0D || d < range * range) { return true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b1540e8bb9332506dbd5762024202414a173c621..db25979960774c59c4bd1d864cc8203f54305d3c 100644 +index b35a09b635315cce408a86f7fb6dbad7911116ae..5fc7354df359c77eecac4873f00abf9b14d73f40 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -435,10 +435,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -233,7 +233,7 @@ index b1540e8bb9332506dbd5762024202414a173c621..db25979960774c59c4bd1d864cc8203f for (ServerPlayer player : (List) server.getHandle().players) { if (player.getBukkitEntity().canSee(this)) { player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle())); -@@ -2699,5 +2704,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2720,5 +2725,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public boolean usesPurpurClient() { return getHandle().purpurClient; } diff --git a/patches/server/0012-Bring-back-server-name.patch b/patches/server/0012-Bring-back-server-name.patch index 0722fa499..94bd5c90f 100644 --- a/patches/server/0012-Bring-back-server-name.patch +++ b/patches/server/0012-Bring-back-server-name.patch @@ -17,10 +17,10 @@ index f944e6beafc7876ed9c6923a22f58d82967b77cb..e1c7b7a659e56fa5b3a1f52cb2ccc99b public final boolean spawnNpcs = this.get("spawn-npcs", true); public final boolean pvp = this.get("pvp", true); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8015ed84e3e37ef0c8377bad66c5658a0279853a..a5c64896d5d87a04773ec578034c5df4febd4914 100644 +index 15227fd4bdd53630dab390e94001734d04c2143a..e8ff8dea26eb464804b950a4e9af74451e33ed17 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2857,4 +2857,11 @@ public final class CraftServer implements Server { +@@ -2870,4 +2870,11 @@ public final class CraftServer implements Server { } // Paper end diff --git a/patches/server/0013-Configurable-server-mod-name.patch b/patches/server/0013-Configurable-server-mod-name.patch index 1a00c841b..b9b34aa92 100644 --- a/patches/server/0013-Configurable-server-mod-name.patch +++ b/patches/server/0013-Configurable-server-mod-name.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f7e76dc842ac226b94ba552ad412cf0dba149394..0eed0dc8aa52a8ea16e47f7183ba7b4235ce362a 100644 +index d9623b26440274f0f84c59c74315ae698d809893..c386c146362138dbf8f397101ad91b3da6b72883 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1716,7 +1716,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= 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 a7c7f3ac0e69f717ee37f9b840b04146661fcf67..bc97a1f4f7c81693ea2e9cc9b5d82a172033d230 100644 +index 8df4992a2efe9a2c54a583825f75c63e1df04283..c791d60081a89e00d4bcc95453b9e2c65c47d8f7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2422,7 +2422,7 @@ public abstract class LivingEntity extends Entity { +@@ -2431,7 +2431,7 @@ public abstract class LivingEntity extends Entity { @Override protected void outOfWorld() { diff --git a/patches/server/0063-Dispenser-curse-of-binding-protection.patch b/patches/server/0063-Dispenser-curse-of-binding-protection.patch index d1c3822cc..39f6088f8 100644 --- a/patches/server/0063-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0063-Dispenser-curse-of-binding-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dispenser curse of binding protection diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 0b7e937b821b4e357cd2e726f5c5e542335cdee0..68858cb7376c8c030a1e4039e76c296894168ce3 100644 +index 461a0149c3b3cb7b6e23790284b7dbf27c860436..867abf68593b5ede92adf80be8c5169e7c3b2665 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -63,6 +63,7 @@ import net.minecraft.world.item.ProjectileWeaponItem; @@ -16,7 +16,7 @@ index 0b7e937b821b4e357cd2e726f5c5e542335cdee0..68858cb7376c8c030a1e4039e76c2968 import net.minecraft.world.level.GameRules; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.Level; -@@ -1096,6 +1097,12 @@ public abstract class Mob extends LivingEntity { +@@ -1100,6 +1101,12 @@ public abstract class Mob extends LivingEntity { } diff --git a/patches/server/0066-Add-5-second-tps-average-in-tps.patch b/patches/server/0066-Add-5-second-tps-average-in-tps.patch index fbbd637ab..9efecad07 100644 --- a/patches/server/0066-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0066-Add-5-second-tps-average-in-tps.patch @@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216 setListData(vector); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5e2d1e31722791f879f09705ebd491dedc6ac1da..20fd8a043ea8e8221aab94479ffb73c4fba290e5 100644 +index 479c30b7062c59478d96ea6d23fc82767c238bbe..160681181705c4cbb34409b5ff2ec3667b308306 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -303,7 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2bdc1caa5748cf947f3941b4388e9f81e4c42ce2..755316f873762f7bb988756a1103127253eec8cc 100644 +index b0459c6b416ad4aec90b4fa44c894f7c592690ca..e9ace0dd9aef27e28766baf6847d82eeafb04bbe 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1633,7 +1633,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1654,7 +1654,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public boolean canSee(org.bukkit.entity.Entity entity) { 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 0757b2bf5..f85f3e458 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 8f77d232a2ce67f8687946959e28b987f40b4523..f46f532dd5c8eadb6250e0aa6161929c7aaa03e3 100644 +index 959e404537c9f6c05b36fc811d3aff3ceb0e6478..f7c6633733460bdfe0a02255f9be5ac385ec915a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1689,7 +1689,7 @@ public abstract class LivingEntity extends Entity { +@@ -1691,7 +1691,7 @@ public abstract class LivingEntity extends Entity { boolean flag = false; if (this.dead && adversary instanceof WitherBoss) { // Paper @@ -18,7 +18,7 @@ index 8f77d232a2ce67f8687946959e28b987f40b4523..f46f532dd5c8eadb6250e0aa6161929c 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 6a0ddb0f337bafa0146e77758759ee5c1c85d5ec..7fa3cd8a7f1005386f68f61cf17e65fb5c9a4958 100644 +index f7d588198876082c456adfe8aba8e3150620e2d2..e569ca15ded9dc4f85dd9d6431470be6844ed593 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -658,7 +658,7 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0134-Add-EntityTeleportHinderedEvent.patch b/patches/server/0134-Add-EntityTeleportHinderedEvent.patch index 6755bfc33..6f33fb3ae 100644 --- a/patches/server/0134-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0134-Add-EntityTeleportHinderedEvent.patch @@ -93,10 +93,10 @@ index 728eba385fe5c658bc61114029192295ec7ebf05..e875bc08aaecc41db09ca0ffa00ff0f1 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 755316f873762f7bb988756a1103127253eec8cc..703eef24baa26475e8ec5f843fbc92420599c20a 100644 +index e9ace0dd9aef27e28766baf6847d82eeafb04bbe..9ff46a5aaecbf66edb8dc76924d4b3427d9bfb8f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1039,6 +1039,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1060,6 +1060,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } if (entity.isVehicle()) { diff --git a/patches/server/0143-One-Punch-Man.patch b/patches/server/0143-One-Punch-Man.patch index 2360b9d55..7dc8c8eb5 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 c34ba47e889f348442d37820e9ba575cb6492ef6..b4cc6b9c94eda63caa4c176a96d7c8babe1284bd 100644 +index f7c6633733460bdfe0a02255f9be5ac385ec915a..693fe29b9b086d8c8c333406479e2baab4d4de4b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2157,6 +2157,20 @@ public abstract class LivingEntity extends Entity { +@@ -2166,6 +2166,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/0187-API-for-any-mob-to-burn-daylight.patch b/patches/server/0187-API-for-any-mob-to-burn-daylight.patch index f9e013ff1..662fe2e4f 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 @@ -29,7 +29,7 @@ index e414f44168a03874910c5ebdb865fe39d91e27b7..7e85785b902a2ef72c09d53f0e24cb2a // 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 6710358370ade90410a836242862cd72703dba95..3f2af5dfa530b0a9e86b707aaec3218d63271c6d 100644 +index 951e583826598a19e92d3e2a02ebd0c7536460d1..17eb40a73e3d73e2fd24ec411c0d76ebf9ae6490 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity { @@ -60,7 +60,7 @@ index 6710358370ade90410a836242862cd72703dba95..3f2af5dfa530b0a9e86b707aaec3218d } // CraftBukkit start -@@ -3427,6 +3434,27 @@ public abstract class LivingEntity extends Entity { +@@ -3436,6 +3443,27 @@ public abstract class LivingEntity extends Entity { this.hurt(DamageSource.DROWN, 1.0F); } @@ -89,10 +89,10 @@ index 6710358370ade90410a836242862cd72703dba95..3f2af5dfa530b0a9e86b707aaec3218d 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 7fa3cd8a7f1005386f68f61cf17e65fb5c9a4958..f760e6f20e65154417e694e94018a3f6760d6ed6 100644 +index e569ca15ded9dc4f85dd9d6431470be6844ed593..1441619edfe075c176ef8e2606eb6f5251558e6c 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1656,17 +1656,7 @@ public abstract class Mob extends LivingEntity { +@@ -1660,17 +1660,7 @@ public abstract class Mob extends LivingEntity { } public boolean isSunBurnTick() { diff --git a/patches/server/0192-Flying-Fall-Damage-API.patch b/patches/server/0192-Flying-Fall-Damage-API.patch index d6891bcc2..290b2ec1c 100644 --- a/patches/server/0192-Flying-Fall-Damage-API.patch +++ b/patches/server/0192-Flying-Fall-Damage-API.patch @@ -26,10 +26,10 @@ index 3b25bbb0cc86c8fba1fb770556c0f8c9ef6ac46e..15a8c193d7f5a0dda7e3d2d1aa967a91 } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 703eef24baa26475e8ec5f843fbc92420599c20a..91d3c8110a3a185780b77c7377640b244af961a2 100644 +index 9ff46a5aaecbf66edb8dc76924d4b3427d9bfb8f..6c6b60119aa89637c822746b77e440f97a186b95 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2744,5 +2744,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2765,5 +2765,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) { getHandle().spawnInvulnerableTime = spawnInvulnerableTime; } diff --git a/patches/server/0216-Toggle-for-kinetic-damage.patch b/patches/server/0216-Toggle-for-kinetic-damage.patch index 3c5ef7bae..eade5e28a 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 ef2efc00ebd610cf0e393b6b604c48cdac2d4bbc..0f36cf3ab761d4f920b461054dba8e1dcf55ffc1 100644 +index 17eb40a73e3d73e2fd24ec411c0d76ebf9ae6490..aecebe3b368c4159e64da305b3b921ae33b1e1a4 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2816,7 +2816,11 @@ public abstract class LivingEntity extends Entity { +@@ -2825,7 +2825,11 @@ public abstract class LivingEntity extends Entity { if (f4 > 0.0F) { this.playSound(this.getFallDamageSound((int) f4), 1.0F, 1.0F); @@ -22,7 +22,7 @@ index ef2efc00ebd610cf0e393b6b604c48cdac2d4bbc..0f36cf3ab761d4f920b461054dba8e1d } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7a3794a71c0a5bef69884e9452001472ce7b1be9..92cb1039d2d27c197d2e040e90d9de3572889174 100644 +index b481c3bf0311058307b1fc38d68047e48c4df44d..b03142997900921e6cf4c105262ff08678e87097 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -176,12 +176,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0227-Extended-OfflinePlayer-API.patch b/patches/server/0227-Extended-OfflinePlayer-API.patch index db17adcd0..04e4223f3 100644 --- a/patches/server/0227-Extended-OfflinePlayer-API.patch +++ b/patches/server/0227-Extended-OfflinePlayer-API.patch @@ -223,10 +223,10 @@ index 1f2bc88d4570c6ef00e67a772b745e0b0c98e051..f505e871a9836503377f168c31c1f09f + // Purpur end - OfflinePlayer API } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 91d3c8110a3a185780b77c7377640b244af961a2..d7008f2a1f647ae042eb7e25068b942e39e4b728 100644 +index 6c6b60119aa89637c822746b77e440f97a186b95..85daead2568eb2bc09843f7841652b7ea8dc161d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2007,6 +2007,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2028,6 +2028,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().getAbilities().walkingSpeed * 2f; }