From 10685bb957059b70c15d586f017facc8b13822d6 Mon Sep 17 00:00:00 2001 From: granny Date: Mon, 25 Dec 2023 18:45:01 -0800 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1cda66e Hotfix Entity isInRain reobf issue PaperMC/Paper@61768e0 [ci skip] Remove no longer needed mappings change PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot) PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit --- gradle.properties | 2 +- .../0011-LivingEntity-safeFallDistance.patch | 4 ++-- .../0018-LivingEntity-broadcastItemBreak.patch | 4 ++-- ...0028-API-for-any-mob-to-burn-daylight.patch | 4 ++-- .../api/0039-Add-local-difficulty-api.patch | 4 ++-- patches/api/0042-Debug-Marker-API.patch | 4 ++-- patches/server/0001-Rebrand.patch | 4 ++-- .../server/0003-Purpur-client-support.patch | 6 +++--- patches/server/0010-AFK-API.patch | 6 +++--- .../0013-LivingEntity-safeFallDistance.patch | 8 ++++---- ...8-Add-allow-water-in-end-world-option.patch | 6 +++--- ...eleport-to-spawn-if-outside-world-bor.patch | 6 +++--- .../0085-LivingEntity-broadcastItemBreak.patch | 4 ++-- ...MC-Configurable-disable-give-dropping.patch | 6 +++--- patches/server/0115-Implement-TPSBar.patch | 6 +++--- ...0171-API-for-any-mob-to-burn-daylight.patch | 8 ++++---- patches/server/0194-Add-compass-command.patch | 8 ++++---- ...nfig-for-mob-last-hurt-by-player-time.patch | 6 +++--- .../server/0259-Add-local-difficulty-api.patch | 4 ++-- patches/server/0263-Remove-Timings.patch | 14 +++++++------- .../server/0264-Remove-Mojang-Profiler.patch | 18 +++++++++--------- patches/server/0267-Debug-Marker-API.patch | 8 ++++---- patches/server/0271-Add-death-screen-API.patch | 4 ++-- ...272-Implement-ram-and-rambar-commands.patch | 6 +++--- 24 files changed, 75 insertions(+), 75 deletions(-) diff --git a/gradle.properties b/gradle.properties index af4e83284..196dbdad1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.4-R0.1-SNAPSHOT mcVersion = 1.20.4 -paperCommit = ff7b9b03805ae54af82135d66dea75b4e6761343 +paperCommit = c215ce185861af0fd123a91a79ad8907d9a7951a org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0011-LivingEntity-safeFallDistance.patch b/patches/api/0011-LivingEntity-safeFallDistance.patch index 9c7429c12..4dc0137f2 100644 --- a/patches/api/0011-LivingEntity-safeFallDistance.patch +++ b/patches/api/0011-LivingEntity-safeFallDistance.patch @@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index a599ed2795ba1baf2cbb465d1c7145580c27e1ea..539d16791673cfc64231995f7db3176e9332a029 100644 +index e68c71047b2bc1b456c380db25b3ff376852b4a9..ddcfa6a4f678801bb09716c0c7bcc06e37add26d 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -1243,4 +1243,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -1270,4 +1270,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ void setBodyYaw(float bodyYaw); // Paper end diff --git a/patches/api/0018-LivingEntity-broadcastItemBreak.patch b/patches/api/0018-LivingEntity-broadcastItemBreak.patch index 6edf0bd41..2aee7393b 100644 --- a/patches/api/0018-LivingEntity-broadcastItemBreak.patch +++ b/patches/api/0018-LivingEntity-broadcastItemBreak.patch @@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 539d16791673cfc64231995f7db3176e9332a029..cadee82cfd27ad48b2bb9e98d1eabb89ce0b59d1 100644 +index ddcfa6a4f678801bb09716c0c7bcc06e37add26d..880b2b045e34eb52a2efcaea4ac4bdfade4c353a 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -1258,5 +1258,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -1285,5 +1285,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param safeFallDistance Safe fall distance */ void setSafeFallDistance(float safeFallDistance); diff --git a/patches/api/0028-API-for-any-mob-to-burn-daylight.patch b/patches/api/0028-API-for-any-mob-to-burn-daylight.patch index a6ccec6fb..8042a33b2 100644 --- a/patches/api/0028-API-for-any-mob-to-burn-daylight.patch +++ b/patches/api/0028-API-for-any-mob-to-burn-daylight.patch @@ -23,10 +23,10 @@ index 566c74756c66db859a4f738a7716a61d012c6df1..c20f29e1ddfd1d73df19f6d6f730fa23 // Purpur end } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index cadee82cfd27ad48b2bb9e98d1eabb89ce0b59d1..298acbfb93663e40e627f6a47d51fd87a1551feb 100644 +index 880b2b045e34eb52a2efcaea4ac4bdfade4c353a..6b025794c34e1b4b47b4b5ae1375705bdedad078 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -1265,5 +1265,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -1292,5 +1292,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param slot Equipment slot to play break animation for */ void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot); diff --git a/patches/api/0039-Add-local-difficulty-api.patch b/patches/api/0039-Add-local-difficulty-api.patch index 9d7fc0257..a99a6a3d1 100644 --- a/patches/api/0039-Add-local-difficulty-api.patch +++ b/patches/api/0039-Add-local-difficulty-api.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 567a36a4887da8994c9170e2885aa8cc357efa0c..26fe07a4429e40da1ce4a0433ae184f594ddb473 100644 +index d3081d4445af73c2c7b23c5fc60861f184ac808e..1173081896ca95ab001175ddf6e269ab5e791896 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -4235,6 +4235,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -4174,6 +4174,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient @Nullable public DragonBattle getEnderDragonBattle(); diff --git a/patches/api/0042-Debug-Marker-API.patch b/patches/api/0042-Debug-Marker-API.patch index 26fc43f14..009c3eec7 100644 --- a/patches/api/0042-Debug-Marker-API.patch +++ b/patches/api/0042-Debug-Marker-API.patch @@ -179,10 +179,10 @@ index c001488119c64f9ee2babce29a8ff9f86aec9bfb..529fb1beadefc79ce6bf5755d5223301 // Purpur end } diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 26fe07a4429e40da1ce4a0433ae184f594ddb473..405d60bd2c99ba741d2614b16f4bda5da48a0387 100644 +index 1173081896ca95ab001175ddf6e269ab5e791896..e4f0d5ee85371374453b837947c7f84c7731128c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -4243,6 +4243,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -4182,6 +4182,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient * @return The local difficulty */ public float getLocalDifficultyAt(@NotNull Location location); diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 09d900872..68e911c0f 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -237,10 +237,10 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..9607675e6c5bff2183c4420d11fc63ee @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 25ffc92c3d6055285a64d9fe36c0054228fe81dd..538f385404450132d295707e3bfe19028b05ad9c 100644 +index 1f1ef68a9a449a4a90c284f34a397ab4b6d905f6..1b75b8286f6203a7268746b5a487d6f089405127 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -916,7 +916,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -915,7 +915,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return EntityCategory.WATER; } diff --git a/patches/server/0003-Purpur-client-support.patch b/patches/server/0003-Purpur-client-support.patch index dc5ae85cf..2fb3a5bfb 100644 --- a/patches/server/0003-Purpur-client-support.patch +++ b/patches/server/0003-Purpur-client-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d1f20a8a3ccea1f074624163eb96da023142a459..f45cd36ddc96d19f11bde4db1094d92ae4b13786 100644 +index 0eb3384df396508c3d26d1e155cd0e6d64251346..393edc13408ed8b3aad36121891eddf75ea321ff 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -281,6 +281,7 @@ public class ServerPlayer extends Player { @@ -43,10 +43,10 @@ index d28d0ef6105ddeb562ddf31ae9088739856941fc..49aaa5147b9b904fa912c1811dc66d47 try { String channels = payload.toString(com.google.common.base.Charsets.UTF_8); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fa5024752652b6daf53dbb9e23a9e86fea203fe2..729cdd9cf47fe8c46df9270202cc6a0d78b61052 100644 +index c54df6e4aed9b7b46a41af4108a8e90d96c1fe1f..3bf86f27beada77d0abf6b91a8fc51e19cc3d787 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3327,4 +3327,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3326,4 +3326,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.spigot; } // Spigot end diff --git a/patches/server/0010-AFK-API.patch b/patches/server/0010-AFK-API.patch index ac3c7aa08..a2b380dcc 100644 --- a/patches/server/0010-AFK-API.patch +++ b/patches/server/0010-AFK-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 40044a75ea071829daa5e531add542d2d24b7988..f9db41f311ad564380587bb2a0b69129e93ef87c 100644 +index f709667d2efab5f7dac22bb6e4b0bf32917f71e4..387e2423d820e4df1d226ce6159a361d6a808fd9 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2233,8 +2233,68 @@ public class ServerPlayer extends Player { @@ -223,7 +223,7 @@ index aaa07fcd4b32fe0de88142ab30378327a01f1729..bc8555d21d418f9da37cc089904f7cb0 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 729cdd9cf47fe8c46df9270202cc6a0d78b61052..6d584e67ac7aac67a93fb369cb3b9f31cd198cb2 100644 +index 3bf86f27beada77d0abf6b91a8fc51e19cc3d787..5f8b485ed8e0444c8c7e2a438cb65113d35bec68 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -524,10 +524,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -243,7 +243,7 @@ index 729cdd9cf47fe8c46df9270202cc6a0d78b61052..6d584e67ac7aac67a93fb369cb3b9f31 for (ServerPlayer player : (List) this.server.getHandle().players) { if (player.getBukkitEntity().canSee(this)) { player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle())); -@@ -3333,5 +3338,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3332,5 +3337,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public boolean usesPurpurClient() { return getHandle().purpurClient; } diff --git a/patches/server/0013-LivingEntity-safeFallDistance.patch b/patches/server/0013-LivingEntity-safeFallDistance.patch index 49462de35..4c56e241d 100644 --- a/patches/server/0013-LivingEntity-safeFallDistance.patch +++ b/patches/server/0013-LivingEntity-safeFallDistance.patch @@ -5,11 +5,11 @@ 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 23a59cf45f89f3d4d9ac98aada26a9027c2485f0..a8d09f76361cc3146aaeba72b7338049b30eb2cb 100644 +index b8375bba69aa8e46db334a1094a071665d9c1a8b..bcdf09cdc8bd54068440237f0a4a1039c8f0750a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -253,6 +253,7 @@ public abstract class LivingEntity extends Entity implements Attackable { - private boolean skipDropExperience; + protected boolean skipDropExperience; // CraftBukkit start public int expToDrop; + public float safeFallDistance = 3.0F; // Purpur @@ -69,10 +69,10 @@ index 2a30499fd6f4a1340f6911f0f7f079bcbe8576a3..c3c0fbe71c9af1125c80698865cb9eaf // Purpur start diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 538f385404450132d295707e3bfe19028b05ad9c..5d2d4f765e7720c3e0b41d31182e3a12cc78ef54 100644 +index 1b75b8286f6203a7268746b5a487d6f089405127..a79273b50233cbabad37392b57e6236ad78a981a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1119,4 +1119,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1118,4 +1118,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { getHandle().knockback(strength, directionX, directionZ); }; // Paper end diff --git a/patches/server/0068-Add-allow-water-in-end-world-option.patch b/patches/server/0068-Add-allow-water-in-end-world-option.patch index 0d7f7fd1d..e9c394fcc 100644 --- a/patches/server/0068-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0068-Add-allow-water-in-end-world-option.patch @@ -27,10 +27,10 @@ index aa0f09a18ea781e027ea70928b30d3e93061120f..5cb8f1e13f4889792395d6b498c0ade2 return true; diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index d89e36f90c7d84eaa627ef1dd9002ea0a03d8a79..4fc9331cda9063d6f3f13572efd7182327c7a9e4 100644 +index e4165be5d645976f4284937b8b1e05fc8a7717d0..8dfad69534dd4d191c7292684e300b5f23a1dc63 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1900,4 +1900,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1894,4 +1894,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } } // Paper end - notify observers even if grow failed @@ -68,7 +68,7 @@ index 4ab6997dad5b112f5105f786a6cee78c6c5667e8..bbf19716d84a0d7e71a11559ef4f6259 } else { world.setBlockAndUpdate(pos, IceBlock.meltsInto()); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index d98e16bc47d3bc458281956bf538f4a37bd0f4b7..387da71594b75a43100790e8e8d69d9246598537 100644 +index 2e78d67201e66c1f3fd1f45ed625e682ea074848..de202a20cdc133d68fb44c56ee017cca153e1cf8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -244,6 +244,11 @@ public class PurpurConfig { diff --git a/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index b2fd0dc4e..4aedb8e9b 100644 --- a/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 092808399b4450e2485d4cc3390a237ba809618a..f1260f9d4bd386c1bfddf977dc47a41082bce4f2 100644 +index e2e25a4ac86156f0915a0b9886a6f62b2812920b..47cc6799f0d48debe4b63280a6814eadf9aecb7d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2846,4 +2846,26 @@ public class ServerPlayer extends Player { +@@ -2847,4 +2847,26 @@ public class ServerPlayer extends Player { return (CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end @@ -36,7 +36,7 @@ index 092808399b4450e2485d4cc3390a237ba809618a..f1260f9d4bd386c1bfddf977dc47a410 + // 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 411d204edd6ea805c0566c6d7ac76dbdd4428309..8148c9596a17396d37b820cac40f50c2073a0c00 100644 +index 83e74527b730a644a69f582b218dbc8d4f35ee61..1ba0b1975135eb29d59f1153e9f5c5019e488bd8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -427,6 +427,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0085-LivingEntity-broadcastItemBreak.patch b/patches/server/0085-LivingEntity-broadcastItemBreak.patch index 2a9252488..66e048ff0 100644 --- a/patches/server/0085-LivingEntity-broadcastItemBreak.patch +++ b/patches/server/0085-LivingEntity-broadcastItemBreak.patch @@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 5d2d4f765e7720c3e0b41d31182e3a12cc78ef54..c5d245649ce3b609f3de360dc9569af410a1de80 100644 +index a79273b50233cbabad37392b57e6236ad78a981a..12c7505c2ce562b3188c079952e57ae1fab5268b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1130,5 +1130,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1129,5 +1129,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setSafeFallDistance(float safeFallDistance) { getHandle().safeFallDistance = safeFallDistance; } diff --git a/patches/server/0108-EMC-Configurable-disable-give-dropping.patch b/patches/server/0108-EMC-Configurable-disable-give-dropping.patch index f9d7076a4..d78d867a1 100644 --- a/patches/server/0108-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0108-EMC-Configurable-disable-give-dropping.patch @@ -8,7 +8,7 @@ purpur.yml to disable the /give command from dropping items on the floor when a player's inventory is full. diff --git a/src/main/java/net/minecraft/server/commands/GiveCommand.java b/src/main/java/net/minecraft/server/commands/GiveCommand.java -index d601d287e94a59ff93b8a83a44dac02544d211df..0ff3b06a98b2f4514b2d861b92dd70fe678ae86c 100644 +index 1b459a8ee8a6bc039e742d65796bc76660a1c765..599172b994d75484f7c7e0ce6d3d3d771c1c44d0 100644 --- a/src/main/java/net/minecraft/server/commands/GiveCommand.java +++ b/src/main/java/net/minecraft/server/commands/GiveCommand.java @@ -59,6 +59,7 @@ public class GiveCommand { @@ -18,9 +18,9 @@ index d601d287e94a59ff93b8a83a44dac02544d211df..0ff3b06a98b2f4514b2d861b92dd70fe + if (org.purpurmc.purpur.PurpurConfig.disableGiveCommandDrops) continue; // Purpur - add config option for toggling give command dropping if (flag && itemstack1.isEmpty()) { itemstack1.setCount(1); - entityitem = entityplayer.drop(itemstack1, false, false, false); // SPIGOT-2942: Add boolean to call event + entityitem = entityplayer.drop(itemstack1, false, false, false); // CraftBukkit - SPIGOT-2942: Add boolean to call event diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index de1a9b08946005d1235264c7658b51bbdc2c47c2..aaf96399f937fbca30f1ce5d64be4af265a4ed29 100644 +index 8f98f665ec20c2df23a6f8bd891c502aba9a6ada..65c31389566007a11934eff92162a4c410a25213 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -209,6 +209,11 @@ public class PurpurConfig { diff --git a/patches/server/0115-Implement-TPSBar.patch b/patches/server/0115-Implement-TPSBar.patch index a502d3603..5b206f85f 100644 --- a/patches/server/0115-Implement-TPSBar.patch +++ b/patches/server/0115-Implement-TPSBar.patch @@ -41,7 +41,7 @@ index e5aa98430309eef04770fb68fd8314ac97fde167..cd8e6eaf4148f87e449e90b84a6c2aaa } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 16058e98dbe426791637682316cf0b11160d30f1..3349082af08600894fbca04533f9ab4a9bf2dfd9 100644 +index 82a551caa75fbd50d75a5109cf7e897e829acf19..448394f5ff2d55b099549b49b77114483f0e58bd 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -282,6 +282,7 @@ public class ServerPlayer extends Player { @@ -68,7 +68,7 @@ index 16058e98dbe426791637682316cf0b11160d30f1..3349082af08600894fbca04533f9ab4a } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -2876,5 +2879,13 @@ public class ServerPlayer extends Player { +@@ -2877,5 +2880,13 @@ public class ServerPlayer extends Player { this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH); } } @@ -103,7 +103,7 @@ index e46fcb5c8bf1047e3f330fd525166aee5f0b646b..61a34f3e49b21254984011bc470d72c8 entityplayer.awardStat(Stats.LEAVE_GAME); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index aaf96399f937fbca30f1ce5d64be4af265a4ed29..61e3bce901bdbf111ffc06521b0e6d5369fce051 100644 +index 65c31389566007a11934eff92162a4c410a25213..57734b187e3a66d0d244db2f7968256884957ff2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -182,6 +182,7 @@ public class PurpurConfig { diff --git a/patches/server/0171-API-for-any-mob-to-burn-daylight.patch b/patches/server/0171-API-for-any-mob-to-burn-daylight.patch index 415dea862..e9ca01e96 100644 --- a/patches/server/0171-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0171-API-for-any-mob-to-burn-daylight.patch @@ -32,7 +32,7 @@ index c45e7caa0ecbeaa1b37f722abba2884a6148ca20..01bf0886d8196ec0a09e7b399636874b return this.hardCollides; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f1f225615dd4a325ea29552f58fb9a6ff982a943..36d4d360c1f60d884f067391b7790e001010b45d 100644 +index 460619aabe69e8837f413c65aa4a575cd5d0d620..bfdfb7cfc36fa3eb4c8c2cfa293dcadcef107a11 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -353,7 +353,7 @@ index 52a576a16bfeb7dc6ec97280f9a5e0f408d71e46..9b1ae2fa1681f1212b6a09d5b10b1663 // Paper end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index fb80b7e2edebf915a98ef608d5b2e27a6c9ae79c..1ac0f0faab8d6a22429f16ea745640bba65ef4ab 100644 +index 98d2ef7870c921093a9dbaf0f4de77d86ef81d44..bfd8f6d85272f3ecbb0f7fc5fc92d2055205c0e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -83,6 +83,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -369,10 +369,10 @@ index fb80b7e2edebf915a98ef608d5b2e27a6c9ae79c..1ac0f0faab8d6a22429f16ea745640bb Preconditions.checkArgument(entity != null, "Unknown entity"); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index c5d245649ce3b609f3de360dc9569af410a1de80..741207b28a57a92d12d02ce3179eb50482ef0c43 100644 +index 12c7505c2ce562b3188c079952e57ae1fab5268b..10ca0fdb5b92cc4f1d346540c9129d5c55732985 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1136,5 +1136,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1135,5 +1135,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { if (slot == null) return; getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot)); } diff --git a/patches/server/0194-Add-compass-command.patch b/patches/server/0194-Add-compass-command.patch index 3f2789d0b..0489a835c 100644 --- a/patches/server/0194-Add-compass-command.patch +++ b/patches/server/0194-Add-compass-command.patch @@ -17,7 +17,7 @@ index bf51f5e414ab45e33efa4057ab251120290b43e1..428dd75450bdd5daf902a1fbaca7031a if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 95853c833ba47a2c136ba6d237dcdcee09fb8de8..074e718e4081d3e37f774613e6929224f28a3e26 100644 +index 852d773149782f052da7e1937d955ba1d19c7f20..fd44606db9581ec93487c51a955b58cb7f3066da 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -283,6 +283,7 @@ public class ServerPlayer extends Player { @@ -44,7 +44,7 @@ index 95853c833ba47a2c136ba6d237dcdcee09fb8de8..074e718e4081d3e37f774613e6929224 } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -2901,5 +2904,13 @@ public class ServerPlayer extends Player { +@@ -2902,5 +2905,13 @@ public class ServerPlayer extends Player { public void tpsBar(boolean tpsBar) { this.tpsBar = tpsBar; } @@ -59,7 +59,7 @@ index 95853c833ba47a2c136ba6d237dcdcee09fb8de8..074e718e4081d3e37f774613e6929224 // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 9a9c4826dab3de9e63ba984f8b2e1b3b7aa5a98b..62fa79eccbb6f679c0460a6dfd457c405b3a8e67 100644 +index 6aa225252d1026979fe88c273652e3d9ebdeb5f3..477639dddb7c5ae0c9cc45a6eca73d82e486409b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -255,6 +255,11 @@ public class PurpurConfig { @@ -89,7 +89,7 @@ index 9a9c4826dab3de9e63ba984f8b2e1b3b7aa5a98b..62fa79eccbb6f679c0460a6dfd457c40 hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector); uptimeFormat = getString("settings.command.uptime.format", uptimeFormat); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 602f8111576de65d6059704cf5d81cba38172236..78381e82ddbfc78ed458908053752f48fee034b0 100644 +index f78716c6d8635c21dacb216760a5ba0ebc33b73f..cc5e11524928bdec5402263eb68a51128b0503df 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -222,6 +222,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0244-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0244-Config-for-mob-last-hurt-by-player-time.patch index 83f1a740c..ec1f5fee2 100644 --- a/patches/server/0244-Config-for-mob-last-hurt-by-player-time.patch +++ b/patches/server/0244-Config-for-mob-last-hurt-by-player-time.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for mob last hurt by player time diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ccf94ec8c0fcff5d75365274f662ff24b3ade75d..0061b6214f87f61f0bb4ddeffed8f719554a6b43 100644 +index df60df664e2fe65f752752bcd084fa68795d4a23..b0db740c43c621daf3d5b6ce7efdd414195c1cd6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1533,13 +1533,13 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -25,10 +25,10 @@ index ccf94ec8c0fcff5d75365274f662ff24b3ade75d..0061b6214f87f61f0bb4ddeffed8f719 if (entityliving2 instanceof net.minecraft.world.entity.player.Player) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 741207b28a57a92d12d02ce3179eb50482ef0c43..5e8c2e77ad615aa3b2bfa3414834dca5db024739 100644 +index 10ca0fdb5b92cc4f1d346540c9129d5c55732985..a2d1c22e778aa4c3c44c3a1a604c1656cc86f0da 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -453,7 +453,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -452,7 +452,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { net.minecraft.server.level.ServerPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle(); getHandle().lastHurtByPlayer = entityPlayer; getHandle().lastHurtByMob = entityPlayer; diff --git a/patches/server/0259-Add-local-difficulty-api.patch b/patches/server/0259-Add-local-difficulty-api.patch index 0ac1d7118..a2e4a93f3 100644 --- a/patches/server/0259-Add-local-difficulty-api.patch +++ b/patches/server/0259-Add-local-difficulty-api.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e1fad381b861471a17529c246bb8a4a9c7646420..648be304b99793fcec850ee6f3965baf1cd679d8 100644 +index 03eab4e7c2648c722c25387ec9353e8dafc09618..96017efa7ab5b43bdd851ce1e78566306254d4a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2360,6 +2360,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2408,6 +2408,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight()); } diff --git a/patches/server/0263-Remove-Timings.patch b/patches/server/0263-Remove-Timings.patch index 30bd76209..232140ec6 100644 --- a/patches/server/0263-Remove-Timings.patch +++ b/patches/server/0263-Remove-Timings.patch @@ -236,10 +236,10 @@ index 8a4037fd2bd679b9952213e6bcd3e96ce589e8c6..0d3d62620659d7897d4ad92147255a99 @Override diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index caa73632aee15583c6b6ed12a668c8f49b794708..c5a4a6a61c160e1cc29ee3c7d03debc0f51ce204 100644 +index d9cd497bc1b654030ff1a597f038b6a881df9f6b..c2f3f9ea436faed6bb52369136384e086aa1237e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -548,15 +548,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -547,15 +547,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider protected void tick(BooleanSupplier shouldKeepTicking) { ProfilerFiller gameprofilerfiller = this.level.getProfiler(); @@ -259,7 +259,7 @@ index caa73632aee15583c6b6ed12a668c8f49b794708..c5a4a6a61c160e1cc29ee3c7d03debc0 } gameprofilerfiller.pop(); -@@ -1156,24 +1156,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1155,24 +1155,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider // Paper start - optimised tracker private final void processTrackQueue() { @@ -288,7 +288,7 @@ index caa73632aee15583c6b6ed12a668c8f49b794708..c5a4a6a61c160e1cc29ee3c7d03debc0 } } // Paper end - optimised tracker -@@ -1188,7 +1188,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1187,7 +1187,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider List list = Lists.newArrayList(); List list1 = this.level.players(); ObjectIterator objectiterator = this.entityMap.values().iterator(); @@ -297,7 +297,7 @@ index caa73632aee15583c6b6ed12a668c8f49b794708..c5a4a6a61c160e1cc29ee3c7d03debc0 ChunkMap.TrackedEntity playerchunkmap_entitytracker; -@@ -1213,17 +1213,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1212,17 +1212,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider playerchunkmap_entitytracker.serverEntity.sendChanges(); } } @@ -731,7 +731,7 @@ index fcdb9bde8e1605e30dde3e580491522d4b62cdc0..7094701d213c73ba47ace806962244c1 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index aec194669dbb13563a83abb64df2f0b64cc64cc7..214a18320d450fc318593b147e0010c42977d421 100644 +index 538cd41c655b6995ea9cc72cf3471a59f3461902..c5486e8c4136dac3d2040841027cc14eecbae6ff 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1311,15 +1311,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -753,7 +753,7 @@ index aec194669dbb13563a83abb64df2f0b64cc64cc7..214a18320d450fc318593b147e0010c4 // Spigot start // Iterator iterator = this.blockEntityTickers.iterator(); boolean flag = this.tickRateManager().runsNormally(); -@@ -1354,7 +1354,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1348,7 +1348,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } this.blockEntityTickers.removeAll(toRemove); diff --git a/patches/server/0264-Remove-Mojang-Profiler.patch b/patches/server/0264-Remove-Mojang-Profiler.patch index 99aeeef75..30b9c9f7f 100644 --- a/patches/server/0264-Remove-Mojang-Profiler.patch +++ b/patches/server/0264-Remove-Mojang-Profiler.patch @@ -447,10 +447,10 @@ index df0c15f6b5b2224d53e4f8fad42b9a1e5f33dc25..5dd0dcb47211cec69189115bf4eab1df } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index c5a4a6a61c160e1cc29ee3c7d03debc0f51ce204..710156f616afd0a9666b3eede98fb19c0f30e777 100644 +index c2f3f9ea436faed6bb52369136384e086aa1237e..2cc249944649ce188584718be2354efbf95f3233 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -546,20 +546,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -545,20 +545,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } protected void tick(BooleanSupplier shouldKeepTicking) { @@ -828,7 +828,7 @@ index 3c0b3db58f31c7b63ab798a7be6076c6cee5f9f6..90fd350cec2ca726ff6707ab2cd3c7af while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f9c516da1cd706095f391e1f64bce581e8dcd676..5cb6f39830c6d4cf31ba011964edbcf9c4f8c75e 100644 +index 2b8f739cb69a67a2926b74fa36ad94f667b836dd..b44dbc0b989658c82aa68e83b094e295dc4e5fe5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1239,7 +1239,7 @@ public class ServerPlayer extends Player { @@ -1213,7 +1213,7 @@ index 24365907591a7e35fff0bc64a1f00e6e907c3bb7..b45064a92674a4c48350c466b8131bf1 } } else { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0061b6214f87f61f0bb4ddeffed8f719554a6b43..3af72be980ed6cab704eedadeb9a9577aca25fc1 100644 +index b0db740c43c621daf3d5b6ce7efdd414195c1cd6..8bbd55274e503284a0d878883c67ff1d47dd03c1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -410,7 +410,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -1808,7 +1808,7 @@ index 9442f58dff89ec843c321533965fbee2727d02f8..17abd085b3faf88e10a44a6c98af9968 if (this.fire) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 214a18320d450fc318593b147e0010c42977d421..8e411a60cdd39ba1a365b29a6dbbb468a8ef6736 100644 +index c5486e8c4136dac3d2040841027cc14eecbae6ff..7eb5af6b9afd0c7dea434da4040fc59a7688803e 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1308,9 +1308,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -1823,7 +1823,7 @@ index 214a18320d450fc318593b147e0010c42977d421..8e411a60cdd39ba1a365b29a6dbbb468 //this.timings.tileEntityPending.startTiming(); // Spigot // Purpur this.tickingBlockEntities = true; if (!this.pendingBlockEntityTickers.isEmpty()) { -@@ -1357,7 +1357,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1351,7 +1351,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { //this.timings.tileEntityTick.stopTiming(); // Spigot // Purpur this.tickingBlockEntities = false; co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper @@ -1832,7 +1832,7 @@ index 214a18320d450fc318593b147e0010c42977d421..8e411a60cdd39ba1a365b29a6dbbb468 this.spigotConfig.currentPrimedTnt = 0; // Spigot } -@@ -1567,7 +1567,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1561,7 +1561,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @Override public List getEntities(@Nullable Entity except, AABB box, Predicate predicate) { @@ -1841,7 +1841,7 @@ index 214a18320d450fc318593b147e0010c42977d421..8e411a60cdd39ba1a365b29a6dbbb468 List list = Lists.newArrayList(); ((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call return list; -@@ -1586,7 +1586,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1580,7 +1580,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } public void getEntities(EntityTypeTest filter, AABB box, Predicate predicate, List result, int limit) { @@ -1850,7 +1850,7 @@ index 214a18320d450fc318593b147e0010c42977d421..8e411a60cdd39ba1a365b29a6dbbb468 // Paper start - optimise this call //TODO use limit if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) { -@@ -1845,6 +1845,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1839,6 +1839,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } public ProfilerFiller getProfiler() { diff --git a/patches/server/0267-Debug-Marker-API.patch b/patches/server/0267-Debug-Marker-API.patch index 850a5819d..8b6fe2410 100644 --- a/patches/server/0267-Debug-Marker-API.patch +++ b/patches/server/0267-Debug-Marker-API.patch @@ -52,10 +52,10 @@ index 966f8e764c2ad42cdfc84b5037081121937598b6..741a3cf8df218635cb5430db8d2c6129 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 648be304b99793fcec850ee6f3965baf1cd679d8..14df9ede813b64f87d97a1ffa96024361b10f131 100644 +index 96017efa7ab5b43bdd851ce1e78566306254d4a0..7321a8dfc59ccb1ae0b7e2d1ce23cb1a5cfbe029 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2364,6 +2364,42 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2412,6 +2412,42 @@ public class CraftWorld extends CraftRegionAccessor implements World { public float getLocalDifficultyAt(Location location) { return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty(); } @@ -99,10 +99,10 @@ index 648be304b99793fcec850ee6f3965baf1cd679d8..14df9ede813b64f87d97a1ffa9602436 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index df3953b541fc85985ded4a89e03bf5d840f7ed6d..c15d14067e9061172ab0b07056ef8b6aa971790c 100644 +index 55d07278e635f9934418ac5c4e679e99b0b5dbd1..0081992c78ad800c7caeb402e90d6e93d3a2d28e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3379,5 +3379,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3378,5 +3378,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void resetIdleTimer() { getHandle().resetLastActionTime(); } diff --git a/patches/server/0271-Add-death-screen-API.patch b/patches/server/0271-Add-death-screen-API.patch index 1a2b8a30e..7e6369b13 100644 --- a/patches/server/0271-Add-death-screen-API.patch +++ b/patches/server/0271-Add-death-screen-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c15d14067e9061172ab0b07056ef8b6aa971790c..1b0c44b7d3c0cd4ba4c9de8b63d94a570af2a0fa 100644 +index 0081992c78ad800c7caeb402e90d6e93d3a2d28e..df4f39d38f1ff4a5e499e227d93d98f531a01419 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3417,5 +3417,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3416,5 +3416,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (this.getHandle().connection == null) return; this.getHandle().connection.send(new net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket(new net.minecraft.network.protocol.common.custom.GameTestClearMarkersDebugPayload())); } diff --git a/patches/server/0272-Implement-ram-and-rambar-commands.patch b/patches/server/0272-Implement-ram-and-rambar-commands.patch index 911b0cef1..7f4064a92 100644 --- a/patches/server/0272-Implement-ram-and-rambar-commands.patch +++ b/patches/server/0272-Implement-ram-and-rambar-commands.patch @@ -18,7 +18,7 @@ index c1202a56b560269e132eafd8bb12383473d4d33e..815af29d1aae935264a400bdb9c3d676 if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index adbce4f4334c8857f0ab2fec910ba3883582256b..07c6e9c5a32ef7155525924d1a0e433943787819 100644 +index b44dbc0b989658c82aa68e83b094e295dc4e5fe5..8e36b261a4f8ea82bab778d3abd3326aa347d19a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -284,6 +284,7 @@ public class ServerPlayer extends Player { @@ -45,7 +45,7 @@ index adbce4f4334c8857f0ab2fec910ba3883582256b..07c6e9c5a32ef7155525924d1a0e4339 nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur } -@@ -2913,5 +2916,13 @@ public class ServerPlayer extends Player { +@@ -2914,5 +2917,13 @@ public class ServerPlayer extends Player { public void compassBar(boolean compassBar) { this.compassBar = compassBar; } @@ -60,7 +60,7 @@ index adbce4f4334c8857f0ab2fec910ba3883582256b..07c6e9c5a32ef7155525924d1a0e4339 // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index ed9b2f0b55229848894d9d6b401d050cb031b893..568bb53e91dda4804cd328a81ba12ce735c52603 100644 +index 40922e69274de6bc3da6f74b0216a816a1fb7722..128eab7246bf263e302cbeb5e4c359a41dd2cd3f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -182,6 +182,8 @@ public class PurpurConfig {