From 51cfcc88da1d5277cf83a95d9f790699bc4d107a Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 1 Jan 2023 12:17:40 -0800 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#8740) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: d352d965 SPIGOT-7221: Add Enemy (Entity) interface CraftBukkit Changes: 397c5557c SPIGOT-7221: Add Enemy (Entity) interface a0d3dfaf2 PR-1129: Fix state corruption while handling explosion damage on EntityComplexPart d67777f8b SPIGOT-7218: Player's outer layer of skin disappears after respawn --- patches/api/0055-Fix-upstream-javadocs.patch | 4 +-- .../api/0140-Slime-Pathfinder-Events.patch | 4 +-- .../api/0141-Add-PhantomPreSpawnEvent.patch | 4 +-- ...n-in-sunlight-API-for-Phantoms-and-S.patch | 4 +-- .../0313-Missing-Entity-Behavior-API.patch | 8 ++--- .../0336-Fix-issues-with-mob-conversion.patch | 4 +-- ...change-the-podium-of-the-EnderDragon.patch | 4 +-- patches/server/0009-Adventure.patch | 12 +++---- .../server/0016-Rewrite-chunk-system.patch | 8 ++--- patches/server/0038-Optimize-explosions.patch | 6 ++-- .../0039-Disable-explosion-knockback.patch | 4 +-- .../0087-Configurable-Player-Collision.patch | 6 ++-- ...le-async-calls-to-restart-the-server.patch | 6 ++-- .../server/0245-Slime-Pathfinder-Events.patch | 4 +-- .../0249-Add-PhantomPreSpawnEvent.patch | 4 +-- ...oggleEvent-when-whitelist-is-toggled.patch | 4 +-- ...and-End-Portal-Frames-from-being-des.patch | 4 +-- ...fix-dead-slime-setSize-invincibility.patch | 4 +-- ...n-in-sunlight-API-for-Phantoms-and-S.patch | 4 +-- .../0633-Add-PlayerKickEvent-causes.patch | 4 +-- .../0649-Missing-Entity-Behavior-API.patch | 8 ++--- ...hange-the-podium-for-the-EnderDragon.patch | 6 ++-- ...tead-of-display-name-in-PlayerList-g.patch | 4 +-- ... 0925-Add-Player-Warden-Warning-API.patch} | 0 ...amage-source-entity-for-explosion-to.patch | 32 ------------------- ...a-friendly-methods-to-update-trades.patch} | 0 ...927-Add-paper-dumplisteners-command.patch} | 0 ...lobal-player-list-where-appropriate.patch} | 2 +- ...sync-entity-add-due-to-fungus-trees.patch} | 0 ....patch => 0930-ItemStack-damage-API.patch} | 0 ...tion-API.patch => 0931-Friction-API.patch} | 2 +- ...trol-player-s-insomnia-and-phantoms.patch} | 0 ...=> 0933-Fix-player-kick-on-shutdown.patch} | 0 ... => 0934-Sync-offhand-slot-in-menus.patch} | 0 ... 0935-Player-Entity-Tracking-Events.patch} | 0 ...tch => 0936-Limit-pet-look-distance.patch} | 0 ...ch => 0937-Properly-resend-entities.patch} | 2 +- ...nd-additions-to-the-SpawnReason-API.patch} | 0 ...ments.patch => 0939-fix-Instruments.patch} | 0 ...940-Fix-chunk-snapshot-biome-getter.patch} | 0 ...for-some-hot-BlockBehavior-and-Flui.patch} | 0 ...-MapLike-Codec-missing-key-selector.patch} | 0 ...es-in-dispense-events-regarding-sta.patch} | 0 ... => 0944-Improve-logging-and-errors.patch} | 0 ...-explosion-yield-with-new-gamerules.patch} | 4 +-- ...tch => 0946-Add-BlockLockCheckEvent.patch} | 0 ... 0947-Add-Sneaking-API-for-Entities.patch} | 0 ....patch => 0948-Improve-PortalEvents.patch} | 0 ...ed-block-state-to-BlockExplodeEvent.patch} | 4 +-- ...ion-for-spider-worldborder-climbing.patch} | 2 +- ...sing-SpigotConfig-logCommands-check.patch} | 0 ...Allay-stopDancing-while-not-dancing.patch} | 0 ...ge.patch => 0953-Flying-Fall-Damage.patch} | 0 ...ion-moving-velocity-to-VehicleBlock.patch} | 0 ...onfig-for-disabling-entity-tag-tags.patch} | 0 ...eturn-0-by-default-for-FireworkMeta.patch} | 0 work/Bukkit | 2 +- work/CraftBukkit | 2 +- 58 files changed, 70 insertions(+), 102 deletions(-) rename patches/server/{0926-Add-Player-Warden-Warning-API.patch => 0925-Add-Player-Warden-Warning-API.patch} (100%) delete mode 100644 patches/server/0925-Reorder-bukkit-damage-source-entity-for-explosion-to.patch rename patches/server/{0927-More-vanilla-friendly-methods-to-update-trades.patch => 0926-More-vanilla-friendly-methods-to-update-trades.patch} (100%) rename patches/server/{0928-Add-paper-dumplisteners-command.patch => 0927-Add-paper-dumplisteners-command.patch} (100%) rename patches/server/{0929-check-global-player-list-where-appropriate.patch => 0928-check-global-player-list-where-appropriate.patch} (98%) rename patches/server/{0930-Fix-async-entity-add-due-to-fungus-trees.patch => 0929-Fix-async-entity-add-due-to-fungus-trees.patch} (100%) rename patches/server/{0931-ItemStack-damage-API.patch => 0930-ItemStack-damage-API.patch} (100%) rename patches/server/{0932-Friction-API.patch => 0931-Friction-API.patch} (98%) rename patches/server/{0933-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0932-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%) rename patches/server/{0934-Fix-player-kick-on-shutdown.patch => 0933-Fix-player-kick-on-shutdown.patch} (100%) rename patches/server/{0935-Sync-offhand-slot-in-menus.patch => 0934-Sync-offhand-slot-in-menus.patch} (100%) rename patches/server/{0936-Player-Entity-Tracking-Events.patch => 0935-Player-Entity-Tracking-Events.patch} (100%) rename patches/server/{0937-Limit-pet-look-distance.patch => 0936-Limit-pet-look-distance.patch} (100%) rename patches/server/{0938-Properly-resend-entities.patch => 0937-Properly-resend-entities.patch} (98%) rename patches/server/{0939-Fixes-and-additions-to-the-SpawnReason-API.patch => 0938-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%) rename patches/server/{0940-fix-Instruments.patch => 0939-fix-Instruments.patch} (100%) rename patches/server/{0941-Fix-chunk-snapshot-biome-getter.patch => 0940-Fix-chunk-snapshot-biome-getter.patch} (100%) rename patches/server/{0942-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0941-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%) rename patches/server/{0943-Fix-MapLike-Codec-missing-key-selector.patch => 0942-Fix-MapLike-Codec-missing-key-selector.patch} (100%) rename patches/server/{0944-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0943-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%) rename patches/server/{0945-Improve-logging-and-errors.patch => 0944-Improve-logging-and-errors.patch} (100%) rename patches/server/{0946-Fix-explosion-yield-with-new-gamerules.patch => 0945-Fix-explosion-yield-with-new-gamerules.patch} (92%) rename patches/server/{0947-Add-BlockLockCheckEvent.patch => 0946-Add-BlockLockCheckEvent.patch} (100%) rename patches/server/{0948-Add-Sneaking-API-for-Entities.patch => 0947-Add-Sneaking-API-for-Entities.patch} (100%) rename patches/server/{0949-Improve-PortalEvents.patch => 0948-Improve-PortalEvents.patch} (100%) rename patches/server/{0950-Add-exploded-block-state-to-BlockExplodeEvent.patch => 0949-Add-exploded-block-state-to-BlockExplodeEvent.patch} (98%) rename patches/server/{0951-Add-config-option-for-spider-worldborder-climbing.patch => 0950-Add-config-option-for-spider-worldborder-climbing.patch} (96%) rename patches/server/{0952-Add-missing-SpigotConfig-logCommands-check.patch => 0951-Add-missing-SpigotConfig-logCommands-check.patch} (100%) rename patches/server/{0953-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0952-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%) rename patches/server/{0954-Flying-Fall-Damage.patch => 0953-Flying-Fall-Damage.patch} (100%) rename patches/server/{0955-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0954-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%) rename patches/server/{0956-config-for-disabling-entity-tag-tags.patch => 0955-config-for-disabling-entity-tag-tags.patch} (100%) rename patches/server/{0957-Return-0-by-default-for-FireworkMeta.patch => 0956-Return-0-by-default-for-FireworkMeta.patch} (100%) diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch index 340f4aa440..fc7999bc9e 100644 --- a/patches/api/0055-Fix-upstream-javadocs.patch +++ b/patches/api/0055-Fix-upstream-javadocs.patch @@ -167,10 +167,10 @@ index 80910fcc46b62ee4974a659713a1a72b5b4c135b..50faa513411cdb611ae228f0c07a7dfe * @deprecated use {@link #sendActionBar(Component)} */ diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java -index 1119e26e270bb45f517955b19d95a9ec3d113634..4631647c64c89ffdde2d9b63bdab974acfe6cb3d 100644 +index a5ad3250cebfeb302c58e0bfd6db1295913c927e..bfac874840cf1f36afba16ae4d176c5821a68cfb 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java -@@ -11,6 +11,16 @@ public interface Slime extends Mob { +@@ -11,6 +11,16 @@ public interface Slime extends Mob, Enemy { public int getSize(); /** diff --git a/patches/api/0140-Slime-Pathfinder-Events.patch b/patches/api/0140-Slime-Pathfinder-Events.patch index 953bdc27eb..e36f26e3b3 100644 --- a/patches/api/0140-Slime-Pathfinder-Events.patch +++ b/patches/api/0140-Slime-Pathfinder-Events.patch @@ -191,10 +191,10 @@ index 0000000000000000000000000000000000000000..4683a7237d2ed527fc85b9b4e5b2eaaf + } +} diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java -index 4631647c64c89ffdde2d9b63bdab974acfe6cb3d..1308dc4ab5779a5cfd9a4e22c43501fc9ceaa7af 100644 +index bfac874840cf1f36afba16ae4d176c5821a68cfb..335b92e7be49ae13b2a1140183650642063a4219 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java -@@ -24,4 +24,20 @@ public interface Slime extends Mob { +@@ -24,4 +24,20 @@ public interface Slime extends Mob, Enemy { * @param sz The new size of the slime. */ public void setSize(int sz); diff --git a/patches/api/0141-Add-PhantomPreSpawnEvent.patch b/patches/api/0141-Add-PhantomPreSpawnEvent.patch index 5ffdc818cb..28b77acfe4 100644 --- a/patches/api/0141-Add-PhantomPreSpawnEvent.patch +++ b/patches/api/0141-Add-PhantomPreSpawnEvent.patch @@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..9022f697ab244df43074e48c9150f39d + } +} diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java -index 1a1044edc57078f96c4a95c994d0865da382c152..ed4d417c2deefb78807cb61b01df5afcd334d754 100644 +index 86cfdcf3060876c87066483d122e12f5feb55e02..082601f349ae2cebbffd1012c19c521241696a09 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java @@ -1,5 +1,8 @@ @@ -54,7 +54,7 @@ index 1a1044edc57078f96c4a95c994d0865da382c152..ed4d417c2deefb78807cb61b01df5afc /** * Represents a phantom. */ -@@ -14,4 +17,14 @@ public interface Phantom extends Flying { +@@ -14,4 +17,14 @@ public interface Phantom extends Flying, Enemy { * @param sz The new size of the phantom. */ public void setSize(int sz); diff --git a/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch index 16cdba8016..3103f1ce2c 100644 --- a/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch +++ b/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch @@ -35,10 +35,10 @@ index 4f4f1e48cdaee0d845f60666569e48731be3fbb9..504fd761e5863c09fe785300a5c3e68e + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java -index ed4d417c2deefb78807cb61b01df5afcd334d754..a40b045f08b85e22e75459b547e7e7c0b95103ed 100644 +index 082601f349ae2cebbffd1012c19c521241696a09..3dafdf14ced991ae1179ef1ca455da62f8c3243e 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java -@@ -26,5 +26,19 @@ public interface Phantom extends Flying { +@@ -26,5 +26,19 @@ public interface Phantom extends Flying, Enemy { */ @Nullable public java.util.UUID getSpawningEntity(); diff --git a/patches/api/0313-Missing-Entity-Behavior-API.patch b/patches/api/0313-Missing-Entity-Behavior-API.patch index 85ac53ba70..4c1e3a9b4e 100644 --- a/patches/api/0313-Missing-Entity-Behavior-API.patch +++ b/patches/api/0313-Missing-Entity-Behavior-API.patch @@ -459,10 +459,10 @@ index c61a473453f33f9d10c330fc46cfa9d52251fe49..473a7e36ad64f866d1d2e09e2ecb2e98 + // Paper end - Add more fox behavior API } diff --git a/src/main/java/org/bukkit/entity/Ghast.java b/src/main/java/org/bukkit/entity/Ghast.java -index d8eb2b5007091c25a14321cb389f3219d76ce452..0fc8a4fcc3ec2ce60bb095c31eb353337d57be34 100644 +index 6b3c9bef9a8a34ddc6ff42cf358541a2665bf5e3..9c618a27d590f186f29c5d9094fc565efd40ca49 100644 --- a/src/main/java/org/bukkit/entity/Ghast.java +++ b/src/main/java/org/bukkit/entity/Ghast.java -@@ -18,4 +18,21 @@ public interface Ghast extends Flying { +@@ -18,4 +18,21 @@ public interface Ghast extends Flying, Enemy { * @param flag Whether the Ghast is charging */ void setCharging(boolean flag); @@ -683,10 +683,10 @@ index 1f027927a1194f4f8e86c1375a2772e6e261c151..57cf24cfd15a541f60aafc8507c18934 NORMAL(false), diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java -index a40b045f08b85e22e75459b547e7e7c0b95103ed..277bebe057439a0c48b0c6e9c003b27565eb4bd2 100644 +index 3dafdf14ced991ae1179ef1ca455da62f8c3243e..2fe8e8868f12bd9e846baf8858cd2c333c00a0d8 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java -@@ -40,5 +40,21 @@ public interface Phantom extends Flying { +@@ -40,5 +40,21 @@ public interface Phantom extends Flying, Enemy { * @param shouldBurnInDay True to burn in sunlight */ public void setShouldBurnInDay(boolean shouldBurnInDay); diff --git a/patches/api/0336-Fix-issues-with-mob-conversion.patch b/patches/api/0336-Fix-issues-with-mob-conversion.patch index dc4f282e2f..f451d967b6 100644 --- a/patches/api/0336-Fix-issues-with-mob-conversion.patch +++ b/patches/api/0336-Fix-issues-with-mob-conversion.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix issues with mob conversion diff --git a/src/main/java/org/bukkit/entity/Hoglin.java b/src/main/java/org/bukkit/entity/Hoglin.java -index b49670816d0d42aee08614d9a59a1f785ad8e6bc..c5296265997f405e5e09d37d610a0c2ae58667e9 100644 +index 83a9e06fe91bdfe74e771b170966c70e4c47893c..452a8e73fa084f29f3b96793d642bd8ec0bc8aac 100644 --- a/src/main/java/org/bukkit/entity/Hoglin.java +++ b/src/main/java/org/bukkit/entity/Hoglin.java -@@ -44,13 +44,17 @@ public interface Hoglin extends Animals { +@@ -44,13 +44,17 @@ public interface Hoglin extends Animals, Enemy { public int getConversionTime(); /** diff --git a/patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch index b86913ddbe..7f59d6b57f 100644 --- a/patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch +++ b/patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow to change the podium of the EnderDragon diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java -index 856015b08bfa3f18b3df11e25efd079d4a4f7eca..23cbaf886e230d38b3023923f74d1a6c34cd9b9d 100644 +index 0449664d7cd0c52ac34d2101110f1ab42070257c..bcf3b6f2d88c3e6170f637943432cc84f69c5065 100644 --- a/src/main/java/org/bukkit/entity/EnderDragon.java +++ b/src/main/java/org/bukkit/entity/EnderDragon.java -@@ -104,4 +104,22 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob { +@@ -104,4 +104,22 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob, Enemy { * @return this dragon's death animation ticks */ int getDeathAnimationTicks(); diff --git a/patches/server/0009-Adventure.patch b/patches/server/0009-Adventure.patch index c7e79c501d..6cfc4da401 100644 --- a/patches/server/0009-Adventure.patch +++ b/patches/server/0009-Adventure.patch @@ -2349,7 +2349,7 @@ index be097f13dba5d408f58d6fada893bed2638d4219..3d7d1ba148dbc3591d8c76b99a2ee7d9 @Override diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c9497bead11bf2b3b859f1c91c9692ce6007e5ed..046560b409c73c73f2c8e645625697bde3e564c2 100644 +index 25227822aa0e1dd7fbbe98a0925ccd023af8d0dc..7cd2af9a08bfca0c7de1ecac21ee7f8a790e8b64 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -8,6 +8,7 @@ import com.mojang.logging.LogUtils; @@ -2455,7 +2455,7 @@ index c9497bead11bf2b3b859f1c91c9692ce6007e5ed..046560b409c73c73f2c8e645625697bd return null; } return entity; -@@ -1139,7 +1139,7 @@ public abstract class PlayerList { +@@ -1140,7 +1140,7 @@ public abstract class PlayerList { public void removeAll() { // CraftBukkit start - disconnect safely for (ServerPlayer player : this.players) { @@ -2464,7 +2464,7 @@ index c9497bead11bf2b3b859f1c91c9692ce6007e5ed..046560b409c73c73f2c8e645625697bd } // CraftBukkit end -@@ -1180,14 +1180,24 @@ public abstract class PlayerList { +@@ -1181,14 +1181,24 @@ public abstract class PlayerList { } public void broadcastChatMessage(PlayerChatMessage message, ServerPlayer sender, ChatType.Bound params) { @@ -2491,7 +2491,7 @@ index c9497bead11bf2b3b859f1c91c9692ce6007e5ed..046560b409c73c73f2c8e645625697bd OutgoingChatMessage outgoingchatmessage = OutgoingChatMessage.create(message); boolean flag1 = false; -@@ -1197,7 +1207,7 @@ public abstract class PlayerList { +@@ -1198,7 +1208,7 @@ public abstract class PlayerList { ServerPlayer entityplayer1 = (ServerPlayer) iterator.next(); flag2 = shouldSendFiltered.test(entityplayer1); @@ -2500,7 +2500,7 @@ index c9497bead11bf2b3b859f1c91c9692ce6007e5ed..046560b409c73c73f2c8e645625697bd } if (flag1 && sender != null) { -@@ -1206,7 +1216,7 @@ public abstract class PlayerList { +@@ -1207,7 +1217,7 @@ public abstract class PlayerList { } @@ -2792,7 +2792,7 @@ index f4455d8a45fbd687a21a46a4c2850f9a3e6432c5..e91305263fcf6929fe62e5e8da467217 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1d4f6e7fcfaaee40b06f74d250d04f7a36b6458b..f7b2211d04bb6b4a11ad7499c6e3a0e945e6d9da 100644 +index 7e9381fcdaafb15b22d9f79592422b165b3e2523..5448d2a6fe8cace246b81742da19666ec24ca48c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -19,6 +19,12 @@ public class Main { diff --git a/patches/server/0016-Rewrite-chunk-system.patch b/patches/server/0016-Rewrite-chunk-system.patch index c7bb49c89e..1d7518a119 100644 --- a/patches/server/0016-Rewrite-chunk-system.patch +++ b/patches/server/0016-Rewrite-chunk-system.patch @@ -15940,7 +15940,7 @@ index e4435962a60cf9c6d833183bd244a2758ff42808..b85545f997447875e737e4d22a8a8dbc StringReader stringreader = new StringReader(packet.getCommand()); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b1cd261b42a2c2de5f5a1aa844ecabc986afe00d..5463b07b24a4572bd9e83b6694fa0162d4911f7b 100644 +index 5ecdd3ed015c220eb8217ea36388d68c05fa1d4c..08f7bafbe1979c3b531cb13255704ea5319b9c07 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -251,7 +251,7 @@ public abstract class PlayerList { @@ -15963,7 +15963,7 @@ index b1cd261b42a2c2de5f5a1aa844ecabc986afe00d..5463b07b24a4572bd9e83b6694fa0162 entityplayer1.spawnIn(worldserver1); entityplayer1.unsetRemoved(); entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot())); -@@ -1271,7 +1271,7 @@ public abstract class PlayerList { +@@ -1272,7 +1272,7 @@ public abstract class PlayerList { public void setViewDistance(int viewDistance) { this.viewDistance = viewDistance; @@ -15972,7 +15972,7 @@ index b1cd261b42a2c2de5f5a1aa844ecabc986afe00d..5463b07b24a4572bd9e83b6694fa0162 Iterator iterator = this.server.getAllLevels().iterator(); while (iterator.hasNext()) { -@@ -1286,7 +1286,7 @@ public abstract class PlayerList { +@@ -1287,7 +1287,7 @@ public abstract class PlayerList { public void setSimulationDistance(int simulationDistance) { this.simulationDistance = simulationDistance; @@ -18004,7 +18004,7 @@ index e91305263fcf6929fe62e5e8da46721707b51517..3ad15c0909d14c6f974e9bf82055c3c3 // Spigot start private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2da35b1caef3958c7a385012d85e65f292c88227..22de7446f4ea6faa79d5006b2a422cfd84f1e22e 100644 +index a7609957da493c5e79771f9ff48e94acadca8bfc..f3cc8a410616c33c0bcbbfeba698139130d5831f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -176,6 +176,81 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0038-Optimize-explosions.patch b/patches/server/0038-Optimize-explosions.patch index 39e0382b29..5357e47758 100644 --- a/patches/server/0038-Optimize-explosions.patch +++ b/patches/server/0038-Optimize-explosions.patch @@ -10,7 +10,7 @@ This patch adds a per-tick cache that is used for storing and retrieving an entity's exposure during an explosion. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4aad7d7de77f82db9d442fbe709cdd52dced895e..8989d13eb6ee94a1dbbe986cfcf0755faaa4e85c 100644 +index ac81428f19e2d445f315000d34173c2d650a9aeb..28d58f402f15ee37cc1bfa3114839db281fc5f57 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1396,6 +1396,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Fri, 11 Nov 2022 11:49:40 +0100 -Subject: [PATCH] Reorder bukkit damage source entity for explosion to exclude - enderdragon part - - -diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 446b0e74c406d3d57268d8332ea4c29a4dd5f9eb..e7ce14ab0732034107e735787354a6fb0ec90f54 100644 ---- a/src/main/java/net/minecraft/world/level/Explosion.java -+++ b/src/main/java/net/minecraft/world/level/Explosion.java -@@ -235,8 +235,6 @@ public class Explosion { - double d13 = (1.0D - d7) * d12; - - // CraftBukkit start -- CraftEventFactory.entityDamage = this.source; -- entity.lastDamageCancelled = false; - - // Special case ender dragon only give knockback if no damage is cancelled - // Thinks to note: -@@ -248,6 +246,11 @@ public class Explosion { - continue; - } - -+ // Paper start - moved from above -+ CraftEventFactory.entityDamage = this.source; -+ entity.lastDamageCancelled = false; -+ // Paper end -+ - if (entity instanceof EnderDragon) { - for (EnderDragonPart entityComplexPart : ((EnderDragon) entity).subEntities) { - if (list.contains(entityComplexPart)) { diff --git a/patches/server/0927-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0926-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0927-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0926-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0928-Add-paper-dumplisteners-command.patch b/patches/server/0927-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0928-Add-paper-dumplisteners-command.patch rename to patches/server/0927-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0929-check-global-player-list-where-appropriate.patch b/patches/server/0928-check-global-player-list-where-appropriate.patch similarity index 98% rename from patches/server/0929-check-global-player-list-where-appropriate.patch rename to patches/server/0928-check-global-player-list-where-appropriate.patch index c1b632ac97..b1d45a9c11 100644 --- a/patches/server/0929-check-global-player-list-where-appropriate.patch +++ b/patches/server/0928-check-global-player-list-where-appropriate.patch @@ -22,7 +22,7 @@ index 3af3dd8f151793dbcca46e110bf7fcdaabd847a7..54c2b7fba83d6f06dba95b1bb5b487a0 + // 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 e3567f8526e289d306cfa8196e60a97a7c1e1266..1274b40a424371b77d8df70ea5f4b2b7300e2a83 100644 +index cb8fa79db4b06bebc0cfab45d745c055475ca788..1083ff15b5a83c9726441ac8b4aa6700e18a5bf3 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3609,7 +3609,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0930-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0929-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0930-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0929-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0931-ItemStack-damage-API.patch b/patches/server/0930-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0931-ItemStack-damage-API.patch rename to patches/server/0930-ItemStack-damage-API.patch diff --git a/patches/server/0932-Friction-API.patch b/patches/server/0931-Friction-API.patch similarity index 98% rename from patches/server/0932-Friction-API.patch rename to patches/server/0931-Friction-API.patch index 6a771cb515..f34ea15234 100644 --- a/patches/server/0932-Friction-API.patch +++ b/patches/server/0931-Friction-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Friction API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1274b40a424371b77d8df70ea5f4b2b7300e2a83..864ab97b7a6c62c376ca38dbbc65bc9406dfd62b 100644 +index 1083ff15b5a83c9726441ac8b4aa6700e18a5bf3..529ea9094c0c7b6263c13b3b7a2d1e652f7bc29e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0933-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0932-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0933-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0932-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0934-Fix-player-kick-on-shutdown.patch b/patches/server/0933-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0934-Fix-player-kick-on-shutdown.patch rename to patches/server/0933-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0935-Sync-offhand-slot-in-menus.patch b/patches/server/0934-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0935-Sync-offhand-slot-in-menus.patch rename to patches/server/0934-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0936-Player-Entity-Tracking-Events.patch b/patches/server/0935-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0936-Player-Entity-Tracking-Events.patch rename to patches/server/0935-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0937-Limit-pet-look-distance.patch b/patches/server/0936-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0937-Limit-pet-look-distance.patch rename to patches/server/0936-Limit-pet-look-distance.patch diff --git a/patches/server/0938-Properly-resend-entities.patch b/patches/server/0937-Properly-resend-entities.patch similarity index 98% rename from patches/server/0938-Properly-resend-entities.patch rename to patches/server/0937-Properly-resend-entities.patch index 7b05fbc428..626bb4e0a7 100644 --- a/patches/server/0938-Properly-resend-entities.patch +++ b/patches/server/0937-Properly-resend-entities.patch @@ -79,7 +79,7 @@ index 50c1d6dedcb7579ce5e83599b47016e4fc8d9d9a..08cb3db28f13c352a162009deeb28ee6 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 69688ab86346c3712a61ae0f09ec22d1b6ab8744..c0b599b1835d28ddda3690b29f29bd8c6f03e215 100644 +index af78bee12160435fc2ea01bfa7a1cd919e353833..8961310c0789c4dd95a729ecc0b8dbf8d701ffc4 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -351,7 +351,7 @@ public abstract class PlayerList { diff --git a/patches/server/0939-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0938-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0939-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0938-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0940-fix-Instruments.patch b/patches/server/0939-fix-Instruments.patch similarity index 100% rename from patches/server/0940-fix-Instruments.patch rename to patches/server/0939-fix-Instruments.patch diff --git a/patches/server/0941-Fix-chunk-snapshot-biome-getter.patch b/patches/server/0940-Fix-chunk-snapshot-biome-getter.patch similarity index 100% rename from patches/server/0941-Fix-chunk-snapshot-biome-getter.patch rename to patches/server/0940-Fix-chunk-snapshot-biome-getter.patch diff --git a/patches/server/0942-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0941-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0942-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0941-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0943-Fix-MapLike-Codec-missing-key-selector.patch b/patches/server/0942-Fix-MapLike-Codec-missing-key-selector.patch similarity index 100% rename from patches/server/0943-Fix-MapLike-Codec-missing-key-selector.patch rename to patches/server/0942-Fix-MapLike-Codec-missing-key-selector.patch diff --git a/patches/server/0944-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0943-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0944-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0943-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0945-Improve-logging-and-errors.patch b/patches/server/0944-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0945-Improve-logging-and-errors.patch rename to patches/server/0944-Improve-logging-and-errors.patch diff --git a/patches/server/0946-Fix-explosion-yield-with-new-gamerules.patch b/patches/server/0945-Fix-explosion-yield-with-new-gamerules.patch similarity index 92% rename from patches/server/0946-Fix-explosion-yield-with-new-gamerules.patch rename to patches/server/0945-Fix-explosion-yield-with-new-gamerules.patch index b3f6828875..744161902a 100644 --- a/patches/server/0946-Fix-explosion-yield-with-new-gamerules.patch +++ b/patches/server/0945-Fix-explosion-yield-with-new-gamerules.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix explosion yield with new gamerules diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index e7ce14ab0732034107e735787354a6fb0ec90f54..122880ca3cfe6528e10e6df4c3200d6c66421c8b 100644 +index f607c40cde7ac2a79ee2cfd618c0c11abbab6e46..ab8467a64202ccafa8188641eb9e3a5941331812 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java -@@ -327,13 +327,13 @@ public class Explosion { +@@ -325,13 +325,13 @@ public class Explosion { float yield; if (explode != null) { diff --git a/patches/server/0947-Add-BlockLockCheckEvent.patch b/patches/server/0946-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0947-Add-BlockLockCheckEvent.patch rename to patches/server/0946-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0948-Add-Sneaking-API-for-Entities.patch b/patches/server/0947-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0948-Add-Sneaking-API-for-Entities.patch rename to patches/server/0947-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0949-Improve-PortalEvents.patch b/patches/server/0948-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0949-Improve-PortalEvents.patch rename to patches/server/0948-Improve-PortalEvents.patch diff --git a/patches/server/0950-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0949-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 98% rename from patches/server/0950-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0949-Add-exploded-block-state-to-BlockExplodeEvent.patch index d3356cf03a..8302db7860 100644 --- a/patches/server/0950-Add-exploded-block-state-to-BlockExplodeEvent.patch +++ b/patches/server/0949-Add-exploded-block-state-to-BlockExplodeEvent.patch @@ -35,10 +35,10 @@ index 8795c94e6b6474addddbb0b337a962e8fac46b2b..2848cb7c76e94d8349f042dc92daf013 public String toString() { diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 122880ca3cfe6528e10e6df4c3200d6c66421c8b..f16593a99ca4089151c2247f6028b823614c78e4 100644 +index ab8467a64202ccafa8188641eb9e3a5941331812..a213f4098859858a73ddd601bbe8c7511972e0d5 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java -@@ -333,7 +333,7 @@ public class Explosion { +@@ -331,7 +331,7 @@ public class Explosion { bukkitBlocks = event.blockList(); yield = event.getYield(); } else { diff --git a/patches/server/0951-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0950-Add-config-option-for-spider-worldborder-climbing.patch similarity index 96% rename from patches/server/0951-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0950-Add-config-option-for-spider-worldborder-climbing.patch index 03220d30d8..828db05f73 100644 --- a/patches/server/0951-Add-config-option-for-spider-worldborder-climbing.patch +++ b/patches/server/0950-Add-config-option-for-spider-worldborder-climbing.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index be54a70b47433c2abaeb8632ffe55d0762f619d6..91b6e1fa1a6f03ea50c703925dd2f5795bcecd5f 100644 +index a05fdfdc1878d4f4619b7eaff81edbae9f1b1537..7555b04dcf274bb624b89f2eb9ff80da0056de4e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -397,6 +397,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0952-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0951-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0952-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0951-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0953-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0952-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0953-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0952-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0954-Flying-Fall-Damage.patch b/patches/server/0953-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0954-Flying-Fall-Damage.patch rename to patches/server/0953-Flying-Fall-Damage.patch diff --git a/patches/server/0955-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0954-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0955-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0954-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0956-config-for-disabling-entity-tag-tags.patch b/patches/server/0955-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0956-config-for-disabling-entity-tag-tags.patch rename to patches/server/0955-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0957-Return-0-by-default-for-FireworkMeta.patch b/patches/server/0956-Return-0-by-default-for-FireworkMeta.patch similarity index 100% rename from patches/server/0957-Return-0-by-default-for-FireworkMeta.patch rename to patches/server/0956-Return-0-by-default-for-FireworkMeta.patch diff --git a/work/Bukkit b/work/Bukkit index aef9b6d205..d352d96500 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit aef9b6d2051e45d924d2e2b294fdb700b357bd3c +Subproject commit d352d96500fbd215d06f4561f374faabb1c0b1fd diff --git a/work/CraftBukkit b/work/CraftBukkit index ae8f5fc025..397c5557ca 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit ae8f5fc02595a9a70dab28ad1835c9cd44ddc60d +Subproject commit 397c5557cac66a242573cec11a2966d812b710d2