From b8aeecb52000d224ae8a8ca72f99603ee479629e Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 3 Dec 2024 22:06:05 +0100 Subject: [PATCH] Compilation fixes --- patches/api/0495-DataComponent-API.patch | 6 ++-- ...event-players-from-moving-into-unloa.patch | 4 +-- ...t-allow-digging-into-unloaded-chunks.patch | 2 +- patches/server/0267-Book-size-limits.patch | 2 +- .../server/0274-Brigadier-Mojang-API.patch | 2 +- .../0275-Limit-Client-Sign-length-more.patch | 2 +- ...item-duplication-and-teleport-issues.patch | 10 +++--- ...47-Prevent-teleporting-dead-entities.patch | 2 +- .../server/0348-Implement-Mob-Goal-API.patch | 5 ++- ...t-position-desync-causing-tp-exploit.patch | 2 +- .../0364-Add-PlayerRecipeBookClickEvent.patch | 2 +- ...66-Add-permission-for-command-blocks.patch | 2 +- ...-position-and-AABB-are-never-invalid.patch | 2 +- ...ld-Difficulty-Remembering-Difficulty.patch | 2 +- ...o-not-accept-invalid-client-settings.patch | 2 +- ...k-for-portal-on-world-gen-entity-add.patch | 2 +- ...ortation-and-cancel-velocity-if-tele.patch | 4 +-- ...y-Counter-to-allow-plugins-to-use-va.patch | 2 +- patches/server/0407-Entity-isTicking.patch | 2 +- ...r-large-move-vectors-crashing-server.patch | 2 +- ...-should-not-bypass-cramming-gamerule.patch | 4 +-- .../server/0435-Limit-recipe-packets.patch | 2 +- .../0443-MC-4-Fix-item-position-desync.patch | 2 +- ...act-event-not-being-called-sometimes.patch | 2 +- ...n-for-requiring-a-player-participant.patch | 2 +- .../0474-Expand-EntityUnleashEvent.patch | 2 +- patches/server/0477-Add-EntityMoveEvent.patch | 2 +- ...-using-signs-inside-spawn-protection.patch | 2 +- ...ignore-result-of-PlayerEditBookEvent.patch | 2 +- ...ItemConsumeEvent-cancelling-properly.patch | 2 +- ...fix-PlayerItemHeldEvent-firing-twice.patch | 2 +- ...524-Expand-PlayerGameModeChangeEvent.patch | 2 +- ...ove-range-check-for-block-placing-up.patch | 2 +- .../0530-Add-Unix-domain-socket-support.patch | 2 +- .../0536-Add-PlayerKickEvent-causes.patch | 2 +- .../server/0545-Line-Of-Sight-Changes.patch | 2 +- patches/server/0550-Missing-Entity-API.patch | 2 +- .../server/0554-Add-PlayerArmSwingEvent.patch | 2 +- ...k-event-leave-message-not-being-sent.patch | 2 +- ...-AFK-kick-while-watching-end-credits.patch | 2 +- ...ptimize-indirect-passenger-iteration.patch | 2 +- .../0575-Add-back-EntityPortalExitEvent.patch | 2 +- ...86-Add-Raw-Byte-Entity-Serialization.patch | 2 +- ...0590-Improve-and-expand-AsyncCatcher.patch | 4 +-- ...-ServerboundCommandSuggestionPacket-.patch | 2 +- ...date-head-rotation-in-missing-places.patch | 2 +- ...-t-attempt-to-teleport-dead-entities.patch | 2 +- ...sive-velocity-through-repeated-crits.patch | 2 +- ...ward-CraftEntity-in-teleport-command.patch | 2 +- .../server/0646-Freeze-Tick-Lock-API.patch | 4 +-- patches/server/0665-More-Projectile-API.patch | 4 +-- ...cle-movement-from-players-while-tele.patch | 2 +- ...assenger-world-matches-ridden-entity.patch | 2 +- .../0688-Add-PlayerStopUsingItemEvent.patch | 2 +- ...entity-loading-causing-async-lookups.patch | 2 +- ...us-missing-EntityDropItemEvent-calls.patch | 2 +- patches/server/0710-More-Teleport-API.patch | 10 ++---- ...ck-entities-after-destroy-prediction.patch | 2 +- patches/server/0717-Collision-API.patch | 4 +-- ...ook-changes-from-crashing-the-server.patch | 2 +- .../0734-Fix-a-bunch-of-vanilla-bugs.patch | 15 ++++++++- .../0741-Add-entity-knockback-API.patch | 2 +- ...tEvent-cancellation-cant-fully-preve.patch | 2 +- ...global-player-list-where-appropriate.patch | 2 +- .../server/0757-ItemStack-damage-API.patch | 2 +- patches/server/0758-Friction-API.patch | 4 +-- .../0762-Player-Entity-Tracking-Events.patch | 2 +- .../0767-Add-Sneaking-API-for-Entities.patch | 2 +- .../0768-Improve-logging-and-errors.patch | 2 +- .../server/0769-Improve-PortalEvents.patch | 2 +- ...ssing-SpigotConfig-logCommands-check.patch | 2 +- ...sion-moving-velocity-to-VehicleBlock.patch | 2 +- ...le-player-info-update-packet-on-join.patch | 2 +- ...nk-items-during-EntityResurrectEvent.patch | 2 +- .../server/0781-Add-Entity-Body-Yaw-API.patch | 6 ++-- ...vancement-triggers-for-entity-damage.patch | 2 +- ...uence-violations-like-they-should-be.patch | 2 +- ...expired-keys-from-impacting-new-join.patch | 2 +- ...esh-ProjectileSource-for-projectiles.patch | 2 +- ...-to-remove-all-active-potion-effects.patch | 2 +- ...d-chunks-for-supporting-block-checks.patch | 2 +- .../0829-Implement-PlayerFailMoveEvent.patch | 2 +- ...Folia-scheduler-and-owned-region-API.patch | 4 +-- ...-API-for-an-entity-s-scoreboard-name.patch | 4 +-- ...te-namespaced-commands-if-send-names.patch | 2 +- .../0849-Add-Listing-API-for-Player.patch | 4 +-- patches/server/0853-Expand-Pose-API.patch | 4 +-- .../server/0855-Add-PlayerPickItemEvent.patch | 2 +- patches/server/0860-Fix-slot-desync.patch | 4 +-- ...ot-sanity-checks-in-container-clicks.patch | 2 +- ...tem-packets-with-collector-as-source.patch | 2 +- ...g-event-call-for-entity-teleport-API.patch | 2 +- ...n-t-fire-sync-events-during-worldgen.patch | 4 +-- ...estore-vanilla-entity-drops-behavior.patch | 4 +-- ...-on-null-loc-for-EntityTeleportEvent.patch | 2 +- ...date-ResourceLocation-in-NBT-reading.patch | 2 +- ...Add-api-for-spawn-egg-texture-colors.patch | 9 ++++-- .../0913-Add-Lifecycle-Event-system.patch | 4 +-- .../server/0914-ItemStack-Tooltip-API.patch | 2 +- .../0922-Add-CartographyItemEvent.patch | 2 +- .../server/0929-Fix-DamageSource-API.patch | 2 +- .../0932-Improve-tag-parser-handling.patch | 2 +- ...he-changed-item-from-dispense-events.patch | 4 +-- ...940-Fix-shield-disable-inconsistency.patch | 2 +- ...a-handling-of-LivingEntity-actuallyH.patch | 2 +- .../0951-Brigadier-based-command-API.patch | 2 +- ...953-Fix-equipment-slot-and-group-API.patch | 2 +- ...oversized-item-data-in-equipment-and.patch | 4 +-- ...cate-InvAction-HOTBAR_MOVE_AND_READD.patch | 2 +- ...amage-tick-when-blocking-with-shield.patch | 2 +- .../0973-Entity-Activation-Range-2.0.patch | 2 +- ...ptimize-Collision-to-not-load-chunks.patch | 14 +-------- ...heck-distance-in-entity-interactions.patch | 2 +- .../0987-Properly-resend-entities.patch | 12 +++---- ...90-Proxy-ItemStack-to-CraftItemStack.patch | 4 +-- ...tityDamageEvents-before-actuallyHurt.patch | 2 +- ...ction-leniency-distance-configurable.patch | 2 +- patches/server/1006-Leashable-API.patch | 2 +- .../1007-Fix-CraftBukkit-drag-system.patch | 2 +- ...sending-chat-to-client-with-updating.patch | 2 +- .../1014-Check-dead-flag-in-isAlive.patch | 2 +- patches/server/1015-Add-FeatureFlag-API.patch | 9 +++--- .../1017-Item-serialization-as-json.patch | 2 +- ...ndPreprocessEvent-on-signed-commands.patch | 2 +- .../1023-Improve-entity-effect-API.patch | 4 +-- .../1027-Void-damage-configuration-API.patch | 4 +-- ...d-proper-async-player-disconnections.patch | 2 +- patches/server/1031-DataComponent-API.patch | 31 ++++++++++--------- .../1034-Rewrite-dataconverter-system.patch | 2 +- .../1035-Moonrise-optimisation-patches.patch | 8 ++--- .../1040-Improved-Watchdog-Support.patch | 2 +- ...l-more-information-in-watchdog-dumps.patch | 2 +- ...-Incremental-chunk-and-player-saving.patch | 4 +-- .../server/1049-Lag-compensation-ticks.patch | 2 +- ...on-checking-in-player-move-packet-ha.patch | 2 +- ...Allow-using-old-ender-pearl-behavior.patch | 2 +- ...ies-in-dispense-events-regarding-sta.patch | 2 +- .../server/1057-Correct-update-cursor.patch | 2 +- ...ect-invulnerability-damage-reduction.patch | 2 +- ...-EntityResurrectEvent-is-uncancelled.patch | 2 +- ...067-Configurable-Entity-Despawn-Time.patch | 2 +- 141 files changed, 219 insertions(+), 218 deletions(-) diff --git a/patches/api/0495-DataComponent-API.patch b/patches/api/0495-DataComponent-API.patch index daf693effa..550b81d926 100644 --- a/patches/api/0495-DataComponent-API.patch +++ b/patches/api/0495-DataComponent-API.patch @@ -1094,7 +1094,7 @@ index 0000000000000000000000000000000000000000..a128348247d8845321d3fecebaa09a51 +} diff --git a/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java b/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java new file mode 100644 -index 0000000000000000000000000000000000000000..826bb860bd55ff18f91d9bc7a5dde4d638b39f98 +index 0000000000000000000000000000000000000000..135ebe0b84027073793c21c71d37eff496d23fec --- /dev/null +++ b/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java @@ -0,0 +1,169 @@ @@ -1153,7 +1153,7 @@ index 0000000000000000000000000000000000000000..826bb860bd55ff18f91d9bc7a5dde4d6 + * @return the model key or null + */ + @Contract(pure = true) -+ @Nullable Key model(); ++ @Nullable Key assetId(); + + /** + * Gets the camera overlay key if present. @@ -1219,7 +1219,7 @@ index 0000000000000000000000000000000000000000..826bb860bd55ff18f91d9bc7a5dde4d6 + * @return the builder for chaining + */ + @Contract(value = "_ -> this", mutates = "this") -+ Builder model(@Nullable Key model); ++ Builder assetId(@Nullable Key model); + + /** + * Sets the camera overlay key for this item. diff --git a/patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch index 7ad3e12b37..5e69669d5c 100644 --- a/patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5f3d7ea96d690b68897d9092c624c77e49822af4..a87ea0f22b44c2fb67fd51bc8c9b0067aacac7de 100644 +index 5f3d7ea96d690b68897d9092c624c77e49822af4..31be5462945287bff7e5c1a3c1f38d6a510ddeb0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -500,9 +500,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -31,7 +31,7 @@ index 5f3d7ea96d690b68897d9092c624c77e49822af4..a87ea0f22b44c2fb67fd51bc8c9b0067 + !worldserver.areChunksLoadedForMove(this.player.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(this.player.position()))) || + !worldserver.areChunksLoadedForMove(entity.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(entity.position()))) + )) { -+ this.connection.send(new ClientboundMoveVehiclePacket(entity)); ++ this.connection.send(ClientboundMoveVehiclePacket.fromEntity(entity)); + return; + } + // Paper end - Prevent moving into unloaded chunks diff --git a/patches/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch index 7603da369f..fabce07670 100644 --- a/patches/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/patches/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch @@ -59,7 +59,7 @@ index 4c8189a2a7edea824545a24dccb376b8eceac001..4623c8acd125dff4919c4e2045b84831 this.level.destroyBlockProgress(this.player.getId(), pos, -1); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a87ea0f22b44c2fb67fd51bc8c9b0067aacac7de..6ea2a25789fe7f90dae7e3de7966c88f39e929a8 100644 +index 31be5462945287bff7e5c1a3c1f38d6a510ddeb0..ac41065d8b5bb9bdc4a37ec9978c12321f14c1bb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1668,6 +1668,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0267-Book-size-limits.patch b/patches/server/0267-Book-size-limits.patch index 2c4374aa7a..c8c750fb6b 100644 --- a/patches/server/0267-Book-size-limits.patch +++ b/patches/server/0267-Book-size-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Book size limits Puts some limits on the size of books. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6ea2a25789fe7f90dae7e3de7966c88f39e929a8..fb01e24ea6fd1d1f4beabb862c70332f92a80d78 100644 +index ac41065d8b5bb9bdc4a37ec9978c12321f14c1bb..02a36b6e276edbf6eb69e1bc213ee5bb93980bbe 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1117,6 +1117,44 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0274-Brigadier-Mojang-API.patch b/patches/server/0274-Brigadier-Mojang-API.patch index 9dc98d9edd..f3372cc3d7 100644 --- a/patches/server/0274-Brigadier-Mojang-API.patch +++ b/patches/server/0274-Brigadier-Mojang-API.patch @@ -119,7 +119,7 @@ index 6212d94503023f7bb5ca21785cbb69babe4421c3..642d5c6849debc5a266605b0df30d552 if (commandnode2.canUse(source)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fb01e24ea6fd1d1f4beabb862c70332f92a80d78..ba10d147705d7d775999d94053cf47b5f481b905 100644 +index 02a36b6e276edbf6eb69e1bc213ee5bb93980bbe..6b1a58db2d521741eae45840d5fcb64884e5c377 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -778,19 +778,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0275-Limit-Client-Sign-length-more.patch b/patches/server/0275-Limit-Client-Sign-length-more.patch index 808ca0937b..49aa35374b 100644 --- a/patches/server/0275-Limit-Client-Sign-length-more.patch +++ b/patches/server/0275-Limit-Client-Sign-length-more.patch @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ba10d147705d7d775999d94053cf47b5f481b905..9f984834f3da2582f21172f2d52783ad3ff5c46d 100644 +index 6b1a58db2d521741eae45840d5fcb64884e5c377..859aa632d063cdd033b99c63b6f3e8837356ed45 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -310,6 +310,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0343-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0343-Fix-item-duplication-and-teleport-issues.patch index 459708b9ce..7f2cff96c8 100644 --- a/patches/server/0343-Fix-item-duplication-and-teleport-issues.patch +++ b/patches/server/0343-Fix-item-duplication-and-teleport-issues.patch @@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the same item twice because the source was destroyed. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e5c280df931fc712e41f4decfeb2871b870d2e4a..15d084e983e8cdfd00dda7fcc2d3c6fac9317cf2 100644 +index e5c280df931fc712e41f4decfeb2871b870d2e4a..c48f634fe80919cb1c2c4d2c1fd647dc63c87749 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2656,11 +2656,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -53,7 +53,7 @@ index e5c280df931fc712e41f4decfeb2871b870d2e4a..15d084e983e8cdfd00dda7fcc2d3c6fa } else { + // Paper start - Fix item duplication and teleport issues + if (this instanceof Leashable leashable) { -+ leashable.dropLeash(true, true); // Paper drop lead ++ leashable.dropLeash(); // Paper drop lead + } + // Paper end - Fix item duplication and teleport issues entity.restoreFrom(this); @@ -68,7 +68,7 @@ index e5c280df931fc712e41f4decfeb2871b870d2e4a..15d084e983e8cdfd00dda7fcc2d3c6fa Iterator iterator = this.getPassengers().iterator(); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 52a1581a301a3aa481b4fe4afc978b0e426e814b..9a4bcbfde22ea3c7761099152db8f793c01aedb5 100644 +index 52a1581a301a3aa481b4fe4afc978b0e426e814b..cd54ab0fed100bf1dd7261185ef0f4e5d4433aa7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1776,9 +1776,9 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -93,8 +93,8 @@ index 52a1581a301a3aa481b4fe4afc978b0e426e814b..9a4bcbfde22ea3c7761099152db8f793 + // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment + org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, damageSource, this.drops, () -> { + final LivingEntity entityliving = this.getKillCredit(); -+ if (this.deathScore >= 0 && entityliving != null) { -+ entityliving.awardKillScore(this, this.deathScore, damageSource); ++ if (entityliving != null) { ++ entityliving.awardKillScore(this, damageSource); + } + }); // Paper end this.postDeathDropItems(deathEvent); // Paper diff --git a/patches/server/0347-Prevent-teleporting-dead-entities.patch b/patches/server/0347-Prevent-teleporting-dead-entities.patch index 7f2a2917af..75dbbc6f16 100644 --- a/patches/server/0347-Prevent-teleporting-dead-entities.patch +++ b/patches/server/0347-Prevent-teleporting-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9f984834f3da2582f21172f2d52783ad3ff5c46d..e9e0a3d0958b309ca17322b11a6612be59ca41a6 100644 +index 859aa632d063cdd033b99c63b6f3e8837356ed45..517c215d47737c551125dec785de2896560f4cb0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1625,6 +1625,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0348-Implement-Mob-Goal-API.patch b/patches/server/0348-Implement-Mob-Goal-API.patch index c0213e9da3..d5ac73f479 100644 --- a/patches/server/0348-Implement-Mob-Goal-API.patch +++ b/patches/server/0348-Implement-Mob-Goal-API.patch @@ -18,10 +18,10 @@ index 221c7dace9950bd4e57299eeff46b2ee4cd05258..3be55cc6e95c02fb43d6e1cd13d05e4e testImplementation("org.hamcrest:hamcrest:2.2") diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java new file mode 100644 -index 0000000000000000000000000000000000000000..05e793e722bbb367ca64cd7f26156fa3dabb8474 +index 0000000000000000000000000000000000000000..36621b42f0dbca9d82a2ca284f30fd9eceab166e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -@@ -0,0 +1,380 @@ +@@ -0,0 +1,379 @@ +package com.destroystokyo.paper.entity.ai; + +import com.destroystokyo.paper.entity.RangedEntity; @@ -272,7 +272,6 @@ index 0000000000000000000000000000000000000000..05e793e722bbb367ca64cd7f26156fa3 + bukkitMap.put(net.minecraft.world.entity.animal.armadillo.Armadillo.class, org.bukkit.entity.Armadillo.class); + bukkitMap.put(net.minecraft.world.entity.monster.Bogged.class, org.bukkit.entity.Bogged.class); + bukkitMap.put(net.minecraft.world.entity.monster.creaking.Creaking.class, org.bukkit.entity.Creaking.class); -+ bukkitMap.put(net.minecraft.world.entity.monster.creaking.CreakingTransient.class, org.bukkit.entity.CreakingTransient.class); + bukkitMap.put(net.minecraft.world.entity.animal.AgeableWaterCreature.class, org.bukkit.entity.Squid.class); // close enough + } + diff --git a/patches/server/0362-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0362-Prevent-position-desync-causing-tp-exploit.patch index 4421a00963..f73360e724 100644 --- a/patches/server/0362-Prevent-position-desync-causing-tp-exploit.patch +++ b/patches/server/0362-Prevent-position-desync-causing-tp-exploit.patch @@ -13,7 +13,7 @@ behaviour, we need to move all of this dangerous logic outside of the move call and into an appropriate place in the tick method. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e9e0a3d0958b309ca17322b11a6612be59ca41a6..b7e3c15055681b916482503f6b2370b362863c9c 100644 +index 517c215d47737c551125dec785de2896560f4cb0..9229caf16997e8bd6da6fae1532372827ec80291 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1413,6 +1413,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0364-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0364-Add-PlayerRecipeBookClickEvent.patch index 1bda25313e..58ea92d25f 100644 --- a/patches/server/0364-Add-PlayerRecipeBookClickEvent.patch +++ b/patches/server/0364-Add-PlayerRecipeBookClickEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerRecipeBookClickEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b7e3c15055681b916482503f6b2370b362863c9c..71785d4b2204030dc718c10494840013d5ea72fa 100644 +index 9229caf16997e8bd6da6fae1532372827ec80291..8570b0ecd2a0db9bb02ebcd12bafa1af31bf4b45 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -201,6 +201,7 @@ import net.minecraft.world.phys.Vec3; diff --git a/patches/server/0366-Add-permission-for-command-blocks.patch b/patches/server/0366-Add-permission-for-command-blocks.patch index 88dc3a8c71..3d1a2ff8ed 100644 --- a/patches/server/0366-Add-permission-for-command-blocks.patch +++ b/patches/server/0366-Add-permission-for-command-blocks.patch @@ -18,7 +18,7 @@ index 4623c8acd125dff4919c4e2045b848310d785da5..86e4559da2344f228ef4d1c4ac3c115f return false; } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 71785d4b2204030dc718c10494840013d5ea72fa..51e718812f2696f05824c735962aa885069d68e3 100644 +index 8570b0ecd2a0db9bb02ebcd12bafa1af31bf4b45..e3b238691a57e4d8317e84921f4c2e67ca994006 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -816,7 +816,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0367-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0367-Ensure-Entity-position-and-AABB-are-never-invalid.patch index e9facd6c2a..19958b8498 100644 --- a/patches/server/0367-Ensure-Entity-position-and-AABB-are-never-invalid.patch +++ b/patches/server/0367-Ensure-Entity-position-and-AABB-are-never-invalid.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 15d084e983e8cdfd00dda7fcc2d3c6fac9317cf2..54650ee682cc307a515e558cc2bd8041aeed01f0 100644 +index c48f634fe80919cb1c2c4d2c1fd647dc63c87749..3860265a50b62fbd36c9e1b32680c3b62d5342a6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -678,8 +678,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0368-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0368-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 329a3d31a9..6ea3956f08 100644 --- a/patches/server/0368-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0368-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -76,7 +76,7 @@ index fe1975675189c6d1a63c42b7959fa40b5ac95ef8..9a3e73a5c206b78dfcf6f41a47b61434 @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 51e718812f2696f05824c735962aa885069d68e3..20d7b673df5e2def564c9b0daee1e943d7522deb 100644 +index e3b238691a57e4d8317e84921f4c2e67ca994006..bc0380322ea9acd055ce844f23c6e38815e31831 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3366,7 +3366,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0373-Do-not-accept-invalid-client-settings.patch b/patches/server/0373-Do-not-accept-invalid-client-settings.patch index 5a6f7f0a1f..61d7b987d0 100644 --- a/patches/server/0373-Do-not-accept-invalid-client-settings.patch +++ b/patches/server/0373-Do-not-accept-invalid-client-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 20d7b673df5e2def564c9b0daee1e943d7522deb..d30febf2f37f2b9c864184f272d5949cbe2dc1e8 100644 +index bc0380322ea9acd055ce844f23c6e38815e31831..eab19d5ac362c4779e91fad0ede3e4c26f29ab01 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3352,6 +3352,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0377-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0377-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch index 555a1d4a24..446ad63d2d 100644 --- a/patches/server/0377-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch +++ b/patches/server/0377-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 9a4bcbfde22ea3c7761099152db8f793c01aedb5..f592bee9f71580ec248e4b7485c938f3b83aeb9d 100644 +index cd54ab0fed100bf1dd7261185ef0f4e5d4433aa7..b742a42b2c86db79fb88399f40e8682afd600507 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3808,7 +3808,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0401-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0401-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 37e4591ad7..6b7040ff05 100644 --- a/patches/server/0401-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0401-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -9,7 +9,7 @@ as this is how Vanilla teleports entities. Cancel any pending motion when teleported. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d30febf2f37f2b9c864184f272d5949cbe2dc1e8..748458bf569e7b96fd7cea6bd8a29d1735eb7d25 100644 +index eab19d5ac362c4779e91fad0ede3e4c26f29ab01..0d7dae5fa79cd302d73d1be51d8bf908a816c4ca 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -680,7 +680,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -22,7 +22,7 @@ index d30febf2f37f2b9c864184f272d5949cbe2dc1e8..748458bf569e7b96fd7cea6bd8a29d17 this.lastGoodY = this.awaitingPositionFromClient.y; this.lastGoodZ = this.awaitingPositionFromClient.z; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 54650ee682cc307a515e558cc2bd8041aeed01f0..65a7d4f564cd608af3829d09c1739eb933024691 100644 +index 3860265a50b62fbd36c9e1b32680c3b62d5342a6..e93f8a9eefc082d66d0e1804c98d0df7db914cd8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -180,6 +180,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0405-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0405-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index f242388ac5..848aa202cd 100644 --- a/patches/server/0405-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/server/0405-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 65a7d4f564cd608af3829d09c1739eb933024691..1bf13cf7aff50f8e67bba579228e5b63ba234421 100644 +index e93f8a9eefc082d66d0e1804c98d0df7db914cd8..56e4a5316e873c0a6fc3495bbfba6dc503cc9c9c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4760,4 +4760,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0407-Entity-isTicking.patch b/patches/server/0407-Entity-isTicking.patch index bb0184cc69..f4c67478a8 100644 --- a/patches/server/0407-Entity-isTicking.patch +++ b/patches/server/0407-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1bf13cf7aff50f8e67bba579228e5b63ba234421..6970e85853954c240bc89407e2aaafdd888bc334 100644 +index 56e4a5316e873c0a6fc3495bbfba6dc503cc9c9c..7609a58979388cb62be7ae94a51cc14774464214 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4765,5 +4765,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0411-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0411-Fix-for-large-move-vectors-crashing-server.patch index 12c0f652ae..2eef81bb77 100644 --- a/patches/server/0411-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/server/0411-Fix-for-large-move-vectors-crashing-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server Check movement distance also based on current position. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 748458bf569e7b96fd7cea6bd8a29d1735eb7d25..8be41f7ea383a27331109813e04d807f38bf6736 100644 +index 0d7dae5fa79cd302d73d1be51d8bf908a816c4ca..1e6c8a23e892fc1c49da9538b435aa3eb0a28934 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -499,9 +499,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0432-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0432-Climbing-should-not-bypass-cramming-gamerule.patch index b79a107f9e..ea3919bcb2 100644 --- a/patches/server/0432-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0432-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6970e85853954c240bc89407e2aaafdd888bc334..b30bc225fe971aed01c7552f66e0c231cfc35d8c 100644 +index 7609a58979388cb62be7ae94a51cc14774464214..fc40880fadb20f7c274c94b1e6a2fa6d0118e672 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2219,6 +2219,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -44,7 +44,7 @@ index b8d57e25851dd7da905100dfd4022e4b99fd7f02..721321a19ce056f82de2bef44a8791dc } else if (entity1 instanceof Player && entity instanceof Player && !io.papermc.paper.configuration.GlobalConfiguration.get().collisions.enablePlayerCollisions) { // Paper - Configurable player collision return false; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f592bee9f71580ec248e4b7485c938f3b83aeb9d..d7e5c2d5935a86bab9987c36df8e1b957fe90ba0 100644 +index b742a42b2c86db79fb88399f40e8682afd600507..f025d36c8ae8606172e8166721f09c851784c3cc 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3722,7 +3722,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0435-Limit-recipe-packets.patch b/patches/server/0435-Limit-recipe-packets.patch index f12a292853..39de7be41f 100644 --- a/patches/server/0435-Limit-recipe-packets.patch +++ b/patches/server/0435-Limit-recipe-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8be41f7ea383a27331109813e04d807f38bf6736..bf4b64f07f21d816eb866d23b290c2f5e5471c70 100644 +index 1e6c8a23e892fc1c49da9538b435aa3eb0a28934..04de96af5415c3115703f5ab42e9fa3aa2ccee60 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -279,6 +279,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0443-MC-4-Fix-item-position-desync.patch b/patches/server/0443-MC-4-Fix-item-position-desync.patch index d954756c7a..f3354a6790 100644 --- a/patches/server/0443-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0443-MC-4-Fix-item-position-desync.patch @@ -28,7 +28,7 @@ index 488ebd443903af812913437f1ade3002093f2470..a043ac10834562d357ef0b5aded2e916 public Vec3 decode(long x, long y, long z) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b30bc225fe971aed01c7552f66e0c231cfc35d8c..341cfedfb06ac0a18b8cca1df5aa4f72b1455737 100644 +index fc40880fadb20f7c274c94b1e6a2fa6d0118e672..64ea966438b0ec9d029b628543177b0faa2c259d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4505,6 +4505,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0449-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0449-Fix-interact-event-not-being-called-sometimes.patch index f98aeaeb6c..d8a7435cf0 100644 --- a/patches/server/0449-Fix-interact-event-not-being-called-sometimes.patch +++ b/patches/server/0449-Fix-interact-event-not-being-called-sometimes.patch @@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes Co-authored-by: Moulberry diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bf4b64f07f21d816eb866d23b290c2f5e5471c70..b0c32f22960ab7f809768037b5014536ef894af9 100644 +index 04de96af5415c3115703f5ab42e9fa3aa2ccee60..76b6c3fca13590f057dc4767d27fef4192974147 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1842,7 +1842,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0466-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0466-Collision-option-for-requiring-a-player-participant.patch index c5dba4f028..7ab28c02eb 100644 --- a/patches/server/0466-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0466-Collision-option-for-requiring-a-player-participant.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 341cfedfb06ac0a18b8cca1df5aa4f72b1455737..e556788a7c5e38c6ed293d566f75ef6501b7464c 100644 +index 64ea966438b0ec9d029b628543177b0faa2c259d..fe7c8a3748627232508c6c9a366977345dda9ad7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2048,6 +2048,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0474-Expand-EntityUnleashEvent.patch b/patches/server/0474-Expand-EntityUnleashEvent.patch index a982255f45..41da32df15 100644 --- a/patches/server/0474-Expand-EntityUnleashEvent.patch +++ b/patches/server/0474-Expand-EntityUnleashEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expand EntityUnleashEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e556788a7c5e38c6ed293d566f75ef6501b7464c..a18e716a8c1c6f1fe23dcd3f4da033da95417e22 100644 +index fe7c8a3748627232508c6c9a366977345dda9ad7..627946dba408cea922614497c0c1b2b48a429f06 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2715,12 +2715,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0477-Add-EntityMoveEvent.patch b/patches/server/0477-Add-EntityMoveEvent.patch index 298e088eb9..c0285a9e47 100644 --- a/patches/server/0477-Add-EntityMoveEvent.patch +++ b/patches/server/0477-Add-EntityMoveEvent.patch @@ -29,7 +29,7 @@ index e56f9e823f9460854c6f0f2f05422136c12aabba..de948bb8903c48e0431c1a46f5aac4fc public LevelChunk getChunkIfLoaded(int x, int z) { return this.chunkSource.getChunk(x, z, false); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d7e5c2d5935a86bab9987c36df8e1b957fe90ba0..2d3f418b5a7a5414ca5be8525146e480add51635 100644 +index f025d36c8ae8606172e8166721f09c851784c3cc..728004ca0c0e0ce40f2357ed8dc5f2a86b9cc50a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3638,6 +3638,20 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0492-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0492-Allow-using-signs-inside-spawn-protection.patch index 7d60145785..e9bc959bc0 100644 --- a/patches/server/0492-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0492-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b0c32f22960ab7f809768037b5014536ef894af9..01771669a8f6aa70d0dbf00fc7a65c7af6233129 100644 +index 76b6c3fca13590f057dc4767d27fef4192974147..26900978386bc97be6f224e9428fae051be6fc22 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1827,7 +1827,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0497-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0497-Don-t-ignore-result-of-PlayerEditBookEvent.patch index 0118a06559..0c7f609166 100644 --- a/patches/server/0497-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/server/0497-Don-t-ignore-result-of-PlayerEditBookEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 01771669a8f6aa70d0dbf00fc7a65c7af6233129..b24b6b93a3615c7aa95f64c13df983d7afc9b974 100644 +index 26900978386bc97be6f224e9428fae051be6fc22..7a38ddcfb2ee373e9464f486bf968210ef10dd1a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1219,7 +1219,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0500-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0500-Fix-PlayerItemConsumeEvent-cancelling-properly.patch index 7ab0446f86..ce126cbfd4 100644 --- a/patches/server/0500-Fix-PlayerItemConsumeEvent-cancelling-properly.patch +++ b/patches/server/0500-Fix-PlayerItemConsumeEvent-cancelling-properly.patch @@ -9,7 +9,7 @@ till their item is switched. This patch clears the active item when the event is cancelled diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2d3f418b5a7a5414ca5be8525146e480add51635..509139ab9a3070c8c96d14fdc4d07bc229b41bd6 100644 +index 728004ca0c0e0ce40f2357ed8dc5f2a86b9cc50a..fc51c7ed9b60a307562c81475ef1cedcb1605798 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -4149,6 +4149,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0507-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0507-fix-PlayerItemHeldEvent-firing-twice.patch index 62cfc0c14b..7da0534687 100644 --- a/patches/server/0507-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/server/0507-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b24b6b93a3615c7aa95f64c13df983d7afc9b974..3f5cd2a2c86daef6659ee9614a9efb26c6f1ce28 100644 +index 7a38ddcfb2ee373e9464f486bf968210ef10dd1a..7864d30a18c76f1170708192e7690cc7b50b15ef 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2014,6 +2014,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0524-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0524-Expand-PlayerGameModeChangeEvent.patch index f8db432260..3b41fe4053 100644 --- a/patches/server/0524-Expand-PlayerGameModeChangeEvent.patch +++ b/patches/server/0524-Expand-PlayerGameModeChangeEvent.patch @@ -134,7 +134,7 @@ index 546be40a8e4470fb5a6686072cdd342cdaa6fe15..e000a918230187f6841b03b7b0dd7368 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3f5cd2a2c86daef6659ee9614a9efb26c6f1ce28..774d087787067faee75d566e796d5b8c88a24f24 100644 +index 7864d30a18c76f1170708192e7690cc7b50b15ef..bfd38864cbb205f56a7c5da76990aca06f04a979 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2818,7 +2818,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0527-Move-range-check-for-block-placing-up.patch b/patches/server/0527-Move-range-check-for-block-placing-up.patch index fce626c69c..8bb305c92a 100644 --- a/patches/server/0527-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0527-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 774d087787067faee75d566e796d5b8c88a24f24..1691d0c4d1e58bfd996a534076398bfdf7680dc1 100644 +index bfd38864cbb205f56a7c5da76990aca06f04a979..b0739538a19e6401111750f833f1b88846c06b49 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1814,6 +1814,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0530-Add-Unix-domain-socket-support.patch b/patches/server/0530-Add-Unix-domain-socket-support.patch index 319ace9f18..445d662e9c 100644 --- a/patches/server/0530-Add-Unix-domain-socket-support.patch +++ b/patches/server/0530-Add-Unix-domain-socket-support.patch @@ -87,7 +87,7 @@ index d6d7f1c446ba5507f67038ff27775ba75156f4a7..c63c194c44646e6bc1a5942655278701 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1691d0c4d1e58bfd996a534076398bfdf7680dc1..7557842ce2d6ca19277a99ab9de5356b11b526b2 100644 +index b0739538a19e6401111750f833f1b88846c06b49..5e809ac566834307ced0c56727c42fc712f026df 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2631,6 +2631,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0536-Add-PlayerKickEvent-causes.patch b/patches/server/0536-Add-PlayerKickEvent-causes.patch index 7fe64f8de8..4fc5c8660e 100644 --- a/patches/server/0536-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0536-Add-PlayerKickEvent-causes.patch @@ -229,7 +229,7 @@ index f8ae8c8eff73e4e87eb34d0f2635517f1688a6f1..59d20fd62e850a38380d877cef95ed69 if (this.cserver.getServer().isRunning()) { this.cserver.getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7557842ce2d6ca19277a99ab9de5356b11b526b2..022ccaf364da665f62c5ff428f0b419174558e3b 100644 +index 5e809ac566834307ced0c56727c42fc712f026df..8f1188bd5e9e1ae7e5318674038c2d7f87d743b7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -361,7 +361,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0545-Line-Of-Sight-Changes.patch b/patches/server/0545-Line-Of-Sight-Changes.patch index a2ee93fb8f..24bc253f3b 100644 --- a/patches/server/0545-Line-Of-Sight-Changes.patch +++ b/patches/server/0545-Line-Of-Sight-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 509139ab9a3070c8c96d14fdc4d07bc229b41bd6..b7c854614643cc6fcb78ce7ac378f5dbbb8eb305 100644 +index fc51c7ed9b60a307562c81475ef1cedcb1605798..7ee81d5891d9d18566012cd72a516870f529628e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3913,7 +3913,8 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0550-Missing-Entity-API.patch b/patches/server/0550-Missing-Entity-API.patch index 3f4ceb1648..c9324ba0e3 100644 --- a/patches/server/0550-Missing-Entity-API.patch +++ b/patches/server/0550-Missing-Entity-API.patch @@ -45,7 +45,7 @@ Co-authored-by: maxcom1 <46265094+maxcom1@users.noreply.github.com> Co-authored-by: TotalledZebra diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -index 05e793e722bbb367ca64cd7f26156fa3dabb8474..3470720466fc81f977c18e3a97bb918926025a22 100644 +index 36621b42f0dbca9d82a2ca284f30fd9eceab166e..d5d617d72c1d160564e3e53d3c6bdffe3d868145 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java @@ -164,7 +164,7 @@ public class MobGoalHelper { diff --git a/patches/server/0554-Add-PlayerArmSwingEvent.patch b/patches/server/0554-Add-PlayerArmSwingEvent.patch index 39a959566c..dd3c00cbf0 100644 --- a/patches/server/0554-Add-PlayerArmSwingEvent.patch +++ b/patches/server/0554-Add-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 022ccaf364da665f62c5ff428f0b419174558e3b..dc9cbd4636bff0db6c7308482413a844c04d8526 100644 +index 8f1188bd5e9e1ae7e5318674038c2d7f87d743b7..176bf8692e19abe0a24df3be28431b438f465613 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2488,7 +2488,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0555-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0555-Fix-kick-event-leave-message-not-being-sent.patch index b908ed7ed0..f4726eea73 100644 --- a/patches/server/0555-Fix-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0555-Fix-kick-event-leave-message-not-being-sent.patch @@ -55,7 +55,7 @@ index 59d20fd62e850a38380d877cef95ed69cb46ecbd..fc242acade3ff06c9213428cde103cf0 MinecraftServer minecraftserver = this.server; Connection networkmanager = this.connection; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index dc9cbd4636bff0db6c7308482413a844c04d8526..94ecc56fb633ecc4ecbfb2f436fadaf2afbc7491 100644 +index 176bf8692e19abe0a24df3be28431b438f465613..fee3bcc109f77b2caaffe95c6bc181457018017d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1975,6 +1975,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0561-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0561-Prevent-AFK-kick-while-watching-end-credits.patch index 8a3982cb60..f27fa5d0f8 100644 --- a/patches/server/0561-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0561-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 94ecc56fb633ecc4ecbfb2f436fadaf2afbc7491..7dfb5d176f88044f8416a2bff38b290d011de066 100644 +index fee3bcc109f77b2caaffe95c6bc181457018017d..b9eb462cf7603fb4afe365f6f094c784a5ee1137 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -398,7 +398,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0568-Optimize-indirect-passenger-iteration.patch b/patches/server/0568-Optimize-indirect-passenger-iteration.patch index 91517284fb..40567f5fc9 100644 --- a/patches/server/0568-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0568-Optimize-indirect-passenger-iteration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a18e716a8c1c6f1fe23dcd3f4da033da95417e22..ddb3d68f064d2dd82b42d0013c65f3685ef1065d 100644 +index 627946dba408cea922614497c0c1b2b48a429f06..20f613427d7521456e1a3609a7be2db50da56cd1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4118,20 +4118,34 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0575-Add-back-EntityPortalExitEvent.patch b/patches/server/0575-Add-back-EntityPortalExitEvent.patch index d9d52b0184..cda1504b0b 100644 --- a/patches/server/0575-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0575-Add-back-EntityPortalExitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ddb3d68f064d2dd82b42d0013c65f3685ef1065d..f9e52b8794d62cc79c420008a1a95707efa14321 100644 +index 20f613427d7521456e1a3609a7be2db50da56cd1..dbea0da4b2c0dda744a1995c779049d3d63351cb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3522,6 +3522,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0586-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0586-Add-Raw-Byte-Entity-Serialization.patch index e2701e2fc7..270801e16a 100644 --- a/patches/server/0586-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0586-Add-Raw-Byte-Entity-Serialization.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f9e52b8794d62cc79c420008a1a95707efa14321..ee2625301ebb1dd601618ae43915891f3b57b7c3 100644 +index dbea0da4b2c0dda744a1995c779049d3d63351cb..ca0353307f6a1d937ec9663a19489135b9844963 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2284,6 +2284,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0590-Improve-and-expand-AsyncCatcher.patch b/patches/server/0590-Improve-and-expand-AsyncCatcher.patch index 204ea7fbff..3214e81ee8 100644 --- a/patches/server/0590-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0590-Improve-and-expand-AsyncCatcher.patch @@ -17,7 +17,7 @@ Async catch modifications to critical entity state Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7dfb5d176f88044f8416a2bff38b290d011de066..7961fbf5c72dae1031ae583baee62a20587b177f 100644 +index b9eb462cf7603fb4afe365f6f094c784a5ee1137..740363cfeb7808994c7e3824163af7af7862fb15 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1651,6 +1651,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -29,7 +29,7 @@ index 7dfb5d176f88044f8416a2bff38b290d011de066..7961fbf5c72dae1031ae583baee62a20 if (player.isRemoved()) { LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName()); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b7c854614643cc6fcb78ce7ac378f5dbbb8eb305..fb3cec13dd9e426904ce28a8755e6cc57296a42e 100644 +index 7ee81d5891d9d18566012cd72a516870f529628e..a5d3e5b402ca0a2e806a783304d43eac9dc142ad 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1143,7 +1143,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0603-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0603-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 470c18a660..064dbb8062 100644 --- a/patches/server/0603-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0603-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7961fbf5c72dae1031ae583baee62a20587b177f..7e46af4a325303df780a088ba8a0d8d4c719fa6b 100644 +index 740363cfeb7808994c7e3824163af7af7862fb15..88ba98aee07764e418edb9052075acea557ceec9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -758,6 +758,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0612-Update-head-rotation-in-missing-places.patch b/patches/server/0612-Update-head-rotation-in-missing-places.patch index d9477bbb64..0d645ccc95 100644 --- a/patches/server/0612-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0612-Update-head-rotation-in-missing-places.patch @@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw. This issue only applies to players. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ee2625301ebb1dd601618ae43915891f3b57b7c3..9d95be758a905209eb1de9ee9d3b0f5af5b14074 100644 +index ca0353307f6a1d937ec9663a19489135b9844963..6457b529ce3dead642f4435c76c3e8a1e31023ba 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1938,6 +1938,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0618-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0618-don-t-attempt-to-teleport-dead-entities.patch index 6dc9c02ca4..1457012403 100644 --- a/patches/server/0618-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/server/0618-don-t-attempt-to-teleport-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9d95be758a905209eb1de9ee9d3b0f5af5b14074..6e0b22b81d25db7a8f98bbf0fc6b4b69f4a678fd 100644 +index 6457b529ce3dead642f4435c76c3e8a1e31023ba..7de1cd151d4ccea4b4f069cc50fc399038ce5de9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -718,7 +718,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0619-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0619-Prevent-excessive-velocity-through-repeated-crits.patch index f0f62f6f2a..c290d77cb1 100644 --- a/patches/server/0619-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/server/0619-Prevent-excessive-velocity-through-repeated-crits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index fb3cec13dd9e426904ce28a8755e6cc57296a42e..dfa1e3548f9b48c20f28712ecb06310fe9c856f5 100644 +index a5d3e5b402ca0a2e806a783304d43eac9dc142ad..d46886a658c5058ba2c622daff96f5daf15ef3f3 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2875,17 +2875,29 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0627-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0627-Forward-CraftEntity-in-teleport-command.patch index ea5a8eee4a..5318066ae6 100644 --- a/patches/server/0627-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0627-Forward-CraftEntity-in-teleport-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6e0b22b81d25db7a8f98bbf0fc6b4b69f4a678fd..17c8a369e5a09276a3918dfb2bb004441e35a8e0 100644 +index 7de1cd151d4ccea4b4f069cc50fc399038ce5de9..68b072415d312e22ef00da3689efcd4631934163 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3511,6 +3511,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0646-Freeze-Tick-Lock-API.patch b/patches/server/0646-Freeze-Tick-Lock-API.patch index 74446f0546..7738c9a43c 100644 --- a/patches/server/0646-Freeze-Tick-Lock-API.patch +++ b/patches/server/0646-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 17c8a369e5a09276a3918dfb2bb004441e35a8e0..4784bfb23a7e0004287f89213d50bcfaaaed9e38 100644 +index 68b072415d312e22ef00da3689efcd4631934163..05a105cfc59bad7ca8fdf2355c6338cdff446d6a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -415,6 +415,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -46,7 +46,7 @@ index 17c8a369e5a09276a3918dfb2bb004441e35a8e0..4784bfb23a7e0004287f89213d50bcfa } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index dfa1e3548f9b48c20f28712ecb06310fe9c856f5..bb96b962439aa62954352f193b44f97d2e826373 100644 +index d46886a658c5058ba2c622daff96f5daf15ef3f3..77fc3086d5848fddf62f301bb4a2dfdaed8b3c3c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3621,7 +3621,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0665-More-Projectile-API.patch b/patches/server/0665-More-Projectile-API.patch index e5cadb6487..8f77d7deb8 100644 --- a/patches/server/0665-More-Projectile-API.patch +++ b/patches/server/0665-More-Projectile-API.patch @@ -521,7 +521,7 @@ index 6e2f91423371ead9890095cf4b1e2299c4dcba28..9d8f4b7176e60180565e3134a14ecf19 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 10a95c1a40597867ffd2974037bfed86dd6deda4..2028f9874e96a3b274528858d4149b04a075f256 100644 +index 10a95c1a40597867ffd2974037bfed86dd6deda4..9399df20ba14ad92379d5d2048e249883eaa8050 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -579,8 +579,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -546,7 +546,7 @@ index 10a95c1a40597867ffd2974037bfed86dd6deda4..2028f9874e96a3b274528858d4149b04 launch = new net.minecraft.world.entity.projectile.Arrow(world, this.getHandle(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.ARROW), null); } - ((net.minecraft.world.entity.projectile.AbstractArrow) launch).shootFromRotation(this.getHandle(), this.getHandle().getXRot(), this.getHandle().getYRot(), 0.0F, 3.0F, 1.0F); // ItemBow -+ ((net.minecraft.world.entity.projectile.AbstractArrow) launch).shootFromRotation(this.getHandle(), this.getHandle().getXRot(), this.getHandle().getYRot(), 0.0F, Trident.class.isAssignableFrom(projectile) ? net.minecraft.world.item.TridentItem.SHOOT_POWER : 3.0F, 1.0F); // ItemBow // Paper - see TridentItem ++ ((net.minecraft.world.entity.projectile.AbstractArrow) launch).shootFromRotation(this.getHandle(), this.getHandle().getXRot(), this.getHandle().getYRot(), 0.0F, Trident.class.isAssignableFrom(projectile) ? net.minecraft.world.item.TridentItem.PROJECTILE_SHOOT_POWER : 3.0F, 1.0F); // ItemBow // Paper - see TridentItem } else if (ThrownPotion.class.isAssignableFrom(projectile)) { if (LingeringPotion.class.isAssignableFrom(projectile)) { launch = new net.minecraft.world.entity.projectile.ThrownPotion(world, this.getHandle(), new net.minecraft.world.item.ItemStack(Items.LINGERING_POTION)); diff --git a/patches/server/0667-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0667-Don-t-allow-vehicle-movement-from-players-while-tele.patch index 987e1bc84b..7ccbeb4b00 100644 --- a/patches/server/0667-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/server/0667-Don-t-allow-vehicle-movement-from-players-while-tele.patch @@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the regular player move packet. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7e46af4a325303df780a088ba8a0d8d4c719fa6b..1d2db5c0b1fbd98308659e878832cf7923b9eab0 100644 +index 88ba98aee07764e418edb9052075acea557ceec9..864ab4d3de50ee9ce9ff2b0538aa46df43985a84 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -491,6 +491,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0676-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0676-Ensure-entity-passenger-world-matches-ridden-entity.patch index df6388cd5f..78807f6d4c 100644 --- a/patches/server/0676-Ensure-entity-passenger-world-matches-ridden-entity.patch +++ b/patches/server/0676-Ensure-entity-passenger-world-matches-ridden-entity.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity Bad plugins doing this would cause some obvious problems... diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4784bfb23a7e0004287f89213d50bcfaaaed9e38..f2572fec8989911803cbcf1110e670b005ae29b0 100644 +index 05a105cfc59bad7ca8fdf2355c6338cdff446d6a..8cf1a2a4dbf1d26d17dc5b4f67a52f7df54dae81 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2833,7 +2833,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0688-Add-PlayerStopUsingItemEvent.patch b/patches/server/0688-Add-PlayerStopUsingItemEvent.patch index 8d30122457..c787da04da 100644 --- a/patches/server/0688-Add-PlayerStopUsingItemEvent.patch +++ b/patches/server/0688-Add-PlayerStopUsingItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index bb96b962439aa62954352f193b44f97d2e826373..a35ee5cca91512a6b534140fe59df0f8355a097d 100644 +index 77fc3086d5848fddf62f301bb4a2dfdaed8b3c3c..91fc54b060d8ab5d8e60a09677afbe1b46798064 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -4210,6 +4210,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0696-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0696-Prevent-entity-loading-causing-async-lookups.patch index 78842ad8aa..59efbd6204 100644 --- a/patches/server/0696-Prevent-entity-loading-causing-async-lookups.patch +++ b/patches/server/0696-Prevent-entity-loading-causing-async-lookups.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f2572fec8989911803cbcf1110e670b005ae29b0..0ab366df0cdd6ccba64e355322ff134cce3b5f42 100644 +index 8cf1a2a4dbf1d26d17dc5b4f67a52f7df54dae81..36f82ba16f30fe4054b19e62a8157cf3d4d07671 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -729,6 +729,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0708-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0708-Add-various-missing-EntityDropItemEvent-calls.patch index 68485d3a81..91e73baabd 100644 --- a/patches/server/0708-Add-various-missing-EntityDropItemEvent-calls.patch +++ b/patches/server/0708-Add-various-missing-EntityDropItemEvent-calls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0ab366df0cdd6ccba64e355322ff134cce3b5f42..f030194e160123df6004c2d22f320e33fed00ed3 100644 +index 36f82ba16f30fe4054b19e62a8157cf3d4d07671..ad548e41740221fa5bb1aee6ba484e213bd1e779 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2698,6 +2698,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0710-More-Teleport-API.patch b/patches/server/0710-More-Teleport-API.patch index 44a78dc343..567bd06573 100644 --- a/patches/server/0710-More-Teleport-API.patch +++ b/patches/server/0710-More-Teleport-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1d2db5c0b1fbd98308659e878832cf7923b9eab0..8bf268094c6034d8b90b0e4d1a5269cce9216cdc 100644 +index 864ab4d3de50ee9ce9ff2b0538aa46df43985a84..90eedcb1013226cd4dbbbaf4ff9332a89e6d7c96 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1639,11 +1639,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -30,7 +30,7 @@ index 1d2db5c0b1fbd98308659e878832cf7923b9eab0..8bf268094c6034d8b90b0e4d1a5269cc positionmoverotation = new PositionMoveRotation(CraftLocation.toVec3D(to), Vec3.ZERO, to.getYaw(), to.getPitch()); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 10fb64df10820974d11f142c102a11a5bd0f317c..8d2f6bb43fb69a4a1e2085960eb24f4397072499 100644 +index 10fb64df10820974d11f142c102a11a5bd0f317c..2335a3501399ea37d2fab2e5267712d7d174041b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -222,15 +222,36 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -72,7 +72,7 @@ index 10fb64df10820974d11f142c102a11a5bd0f317c..8d2f6bb43fb69a4a1e2085960eb24f43 // Let the server handle cross world teleports if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) { -@@ -971,6 +992,39 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -971,6 +992,35 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return CraftEntity.perm; } @@ -88,10 +88,6 @@ index 10fb64df10820974d11f142c102a11a5bd0f317c..8d2f6bb43fb69a4a1e2085960eb24f43 + + world.loadChunksForMoveAsync(getHandle().getBoundingBoxAt(locationClone.getX(), locationClone.getY(), locationClone.getZ()), + this instanceof CraftPlayer ? ca.spottedleaf.concurrentutil.util.Priority.HIGHER : ca.spottedleaf.concurrentutil.util.Priority.NORMAL, (list) -> { -+ net.minecraft.server.level.ServerChunkCache chunkProviderServer = world.getChunkSource(); -+ for (net.minecraft.world.level.chunk.ChunkAccess chunk : list) { -+ chunkProviderServer.addTicketAtLevel(net.minecraft.server.level.TicketType.POST_TELEPORT, chunk.getPos(), 33, CraftEntity.this.getEntityId()); -+ } + net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> { + try { + ret.complete(CraftEntity.this.teleport(locationClone, cause, teleportFlags) ? Boolean.TRUE : Boolean.FALSE); diff --git a/patches/server/0713-Send-block-entities-after-destroy-prediction.patch b/patches/server/0713-Send-block-entities-after-destroy-prediction.patch index d1af4084e0..f82930ea8f 100644 --- a/patches/server/0713-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0713-Send-block-entities-after-destroy-prediction.patch @@ -57,7 +57,7 @@ index 5c3e5c348e6fececccd8097355f423b9e7ad982b..064a7a3e1c4d192010e072a5e985a541 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8bf268094c6034d8b90b0e4d1a5269cce9216cdc..196026e7f0689270d9c7320109c9f4fbe697f3d0 100644 +index 90eedcb1013226cd4dbbbaf4ff9332a89e6d7c96..aeaf2d4f7a0ad0621c210cd479c610104ec7a83b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1779,8 +1779,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0717-Collision-API.patch b/patches/server/0717-Collision-API.patch index 6798d0e429..3274a0da24 100644 --- a/patches/server/0717-Collision-API.patch +++ b/patches/server/0717-Collision-API.patch @@ -22,10 +22,10 @@ index a7748f4b7c5a1630937c702b3fd5fded93793d64..a93a879117ee1eb06842242aa03f757a // 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 8d2f6bb43fb69a4a1e2085960eb24f4397072499..fc48a1de886d48da4cb384472f48cdba974034dd 100644 +index 2335a3501399ea37d2fab2e5267712d7d174041b..87edb57f843bd726e87403efa10e4287aa52e660 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1189,4 +1189,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1185,4 +1185,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return this.getHandle().noPhysics; } // Paper end - missing entity api diff --git a/patches/server/0723-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0723-Stop-large-look-changes-from-crashing-the-server.patch index 9bd4cdc31f..9bf6f902e6 100644 --- a/patches/server/0723-Stop-large-look-changes-from-crashing-the-server.patch +++ b/patches/server/0723-Stop-large-look-changes-from-crashing-the-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server Co-authored-by: Jaren Knodel diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a35ee5cca91512a6b534140fe59df0f8355a097d..2d914f94c7c667ecb934254649d32190c3e1633a 100644 +index 91fc54b060d8ab5d8e60a09677afbe1b46798064..28eb50111e524bce5aadb1dd2eea14a7df0105f2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3282,37 +3282,15 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0734-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0734-Fix-a-bunch-of-vanilla-bugs.patch index b3b7dbcdac..1d7ed8d61c 100644 --- a/patches/server/0734-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0734-Fix-a-bunch-of-vanilla-bugs.patch @@ -115,7 +115,7 @@ index 064a7a3e1c4d192010e072a5e985a54135748d87..a706f0855fdf88cc9aece3ba00ef574b this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit this.level.updateSleepingPlayerList(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 196026e7f0689270d9c7320109c9f4fbe697f3d0..2fd7f959d3ad7e7f034ac883aacd638aed701e2b 100644 +index aeaf2d4f7a0ad0621c210cd479c610104ec7a83b..c078b3bc75e52456f458c7febc51ea6f8b29f737 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1889,7 +1889,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -319,6 +319,19 @@ index 8aab6f68f576fb022eb59798585e264f5aafbc69..edd6017937a7f20a1b43fa15204ec130 super.setRemoved(); } +diff --git a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java +index 476caf7fb4f0124daa35822f2161e11620f18621..b6f9aca593a66fd1e18ab2c4d1989c08824fa6b4 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java +@@ -391,7 +391,7 @@ public final class TrialSpawner { + } + + public void overrideEntityToSpawn(EntityType entityType, Level world) { +- this.data.reset(); ++ this.data.reset(this); // Paper + this.normalConfig = Holder.direct(((TrialSpawnerConfig) this.normalConfig.value()).withSpawning(entityType)); + this.ominousConfig = Holder.direct(((TrialSpawnerConfig) this.ominousConfig.value()).withSpawning(entityType)); + this.setState(world, TrialSpawnerState.INACTIVE); diff --git a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java index 2f808e5f3a5fb2b63f273f6da47292cfd9719bcc..f4ba1afe2f4dc528fc154258d8bc9e144794980f 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java diff --git a/patches/server/0741-Add-entity-knockback-API.patch b/patches/server/0741-Add-entity-knockback-API.patch index 3fe877123b..a9b58b4c8d 100644 --- a/patches/server/0741-Add-entity-knockback-API.patch +++ b/patches/server/0741-Add-entity-knockback-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 2028f9874e96a3b274528858d4149b04a075f256..ed67bf4f30afa9dba604cc406b0a4fbe99dbb2b2 100644 +index 9399df20ba14ad92379d5d2048e249883eaa8050..5efa27ab1e03eed4b2b05c4ea667b536ebc110bd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1146,4 +1146,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0749-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0749-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch index ce92b92539..58f70904f6 100644 --- a/patches/server/0749-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch +++ b/patches/server/0749-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f030194e160123df6004c2d22f320e33fed00ed3..107bb275b422cde0ff648176aa15573739a2c80b 100644 +index ad548e41740221fa5bb1aee6ba484e213bd1e779..0b55f92576a4257d210a53e9e77fcd573d558fc7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3351,6 +3351,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0755-check-global-player-list-where-appropriate.patch b/patches/server/0755-check-global-player-list-where-appropriate.patch index 53008287be..12092601ea 100644 --- a/patches/server/0755-check-global-player-list-where-appropriate.patch +++ b/patches/server/0755-check-global-player-list-where-appropriate.patch @@ -24,7 +24,7 @@ index ee1b0bb6c6681c32b32ebf50e15e261a123beb1a..334b21a37196f4bf1046d9506c9a491d + // Paper end - check global player list where appropriate } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2d914f94c7c667ecb934254649d32190c3e1633a..a69fbbbb38d1222d4e067550fa71a98beb4afb18 100644 +index 28eb50111e524bce5aadb1dd2eea14a7df0105f2..26c25f9ccd59922ced968abef41683c2b6b45e7d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3877,7 +3877,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0757-ItemStack-damage-API.patch b/patches/server/0757-ItemStack-damage-API.patch index 4d8a5019b0..de20adcd15 100644 --- a/patches/server/0757-ItemStack-damage-API.patch +++ b/patches/server/0757-ItemStack-damage-API.patch @@ -67,7 +67,7 @@ index 679112d1622744680b7d3c7d296acafac019d00a..63872104e7302dbbc9c482a4ed8a9a34 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index ed67bf4f30afa9dba604cc406b0a4fbe99dbb2b2..ad7f1adab37376814d01398b0fd469cbcc91ab3a 100644 +index 5efa27ab1e03eed4b2b05c4ea667b536ebc110bd..20b84c87ef0987f76a4932f45a7d1534a74a8c00 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1154,4 +1154,48 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0758-Friction-API.patch b/patches/server/0758-Friction-API.patch index 7aae2276b9..2314f923e3 100644 --- a/patches/server/0758-Friction-API.patch +++ b/patches/server/0758-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 a69fbbbb38d1222d4e067550fa71a98beb4afb18..b2c94edf9e1161aa97aa56f4124d96bd6a9b42ce 100644 +index 26c25f9ccd59922ced968abef41683c2b6b45e7d..cdd94eb9b82bb22505461ae135d12914d7446b00 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -294,6 +294,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -199,7 +199,7 @@ index 1a291dd8a287db30e71dcb315599fc4b038764c4..30d62ee4d5cd2ddacb8783b5bbbf475d public int getHealth() { return this.getHandle().health; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index ad7f1adab37376814d01398b0fd469cbcc91ab3a..8bda60a24c25d7a529f8ef1c70ea2442f76e1bfe 100644 +index 20b84c87ef0987f76a4932f45a7d1534a74a8c00..812194dac108e446cd987c474ec6e582eaaed32b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1198,4 +1198,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0762-Player-Entity-Tracking-Events.patch b/patches/server/0762-Player-Entity-Tracking-Events.patch index f4b8acaeab..3cbe275c83 100644 --- a/patches/server/0762-Player-Entity-Tracking-Events.patch +++ b/patches/server/0762-Player-Entity-Tracking-Events.patch @@ -21,7 +21,7 @@ index 2d325c998e40a65af10d6adbb0dc304bea50e3d8..c1c2eeba0f5b8e499cc51cc1df7bf9ac } else if (this.seenBy.remove(player.connection)) { this.serverEntity.removePairing(player); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 107bb275b422cde0ff648176aa15573739a2c80b..d484edbf30090d7b2167f2adafd5528bc3d76ccb 100644 +index 0b55f92576a4257d210a53e9e77fcd573d558fc7..827f141834ac903adca919f3514a468b7b6de089 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4106,7 +4106,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0767-Add-Sneaking-API-for-Entities.patch b/patches/server/0767-Add-Sneaking-API-for-Entities.patch index aaf72ccfd7..b2f14ced80 100644 --- a/patches/server/0767-Add-Sneaking-API-for-Entities.patch +++ b/patches/server/0767-Add-Sneaking-API-for-Entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index fc48a1de886d48da4cb384472f48cdba974034dd..ca9cda9059a5c1dae1ca9ec09248768274d4e207 100644 +index 87edb57f843bd726e87403efa10e4287aa52e660..087bf6f78457308488d52db04cac32d3a9dec4a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -870,6 +870,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0768-Improve-logging-and-errors.patch b/patches/server/0768-Improve-logging-and-errors.patch index 7f97159651..aec88d7e1b 100644 --- a/patches/server/0768-Improve-logging-and-errors.patch +++ b/patches/server/0768-Improve-logging-and-errors.patch @@ -52,7 +52,7 @@ index 4e47611f85f3db6a638d0fc6a0dd712b245cf229..ebe6a002d883721d80cbfcc004064e8a } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2fd7f959d3ad7e7f034ac883aacd638aed701e2b..658796ce6d6398148ffee12f115e69a6e949e0e2 100644 +index c078b3bc75e52456f458c7febc51ea6f8b29f737..ce818321177df69ee81a9a237f2f44216ecea640 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3502,7 +3502,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0769-Improve-PortalEvents.patch b/patches/server/0769-Improve-PortalEvents.patch index 39e5f41dc5..88802cbfdd 100644 --- a/patches/server/0769-Improve-PortalEvents.patch +++ b/patches/server/0769-Improve-PortalEvents.patch @@ -18,7 +18,7 @@ index a62e16b88a400c0715ddbdc33d25663303cc9103..a5eaac3fb6d949098a9fca20d9dbff59 // Paper start - gateway-specific teleport event if (this.portalProcess != null && this.portalProcess.isSamePortal(((net.minecraft.world.level.block.EndGatewayBlock) net.minecraft.world.level.block.Blocks.END_GATEWAY)) && this.serverLevel().getBlockEntity(this.portalProcess.getEntryPosition()) instanceof net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity theEndGatewayBlockEntity) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d484edbf30090d7b2167f2adafd5528bc3d76ccb..b3036c121064af76f0d7cd538245a47801a3a738 100644 +index 827f141834ac903adca919f3514a468b7b6de089..1f9379ac11b15b564e70fcab655bc5e50b584e65 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3777,7 +3777,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0771-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0771-Add-missing-SpigotConfig-logCommands-check.patch index f1bb7f0c4c..a8a18cd319 100644 --- a/patches/server/0771-Add-missing-SpigotConfig-logCommands-check.patch +++ b/patches/server/0771-Add-missing-SpigotConfig-logCommands-check.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check Co-authored-by: david diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 658796ce6d6398148ffee12f115e69a6e949e0e2..3f4f3236522672552de106a5326b12e396355dc6 100644 +index ce818321177df69ee81a9a237f2f44216ecea640..0c7fa826ee3f7a0851b49487484eb2ca39d9fcd7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2139,7 +2139,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0774-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0774-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch index 829ce3de58..35080d56e0 100644 --- a/patches/server/0774-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch +++ b/patches/server/0774-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b3036c121064af76f0d7cd538245a47801a3a738..bea167afbdd3a2f54b00c3abdb840014313fd239 100644 +index 1f9379ac11b15b564e70fcab655bc5e50b584e65..5b2341e07d66feb4a3975eb2eb6208306c3ebaa9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -977,6 +977,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0776-Use-single-player-info-update-packet-on-join.patch b/patches/server/0776-Use-single-player-info-update-packet-on-join.patch index 4b7db8cb14..e3f807e9e0 100644 --- a/patches/server/0776-Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/0776-Use-single-player-info-update-packet-on-join.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3f4f3236522672552de106a5326b12e396355dc6..16cb1ed6b47972a6bf6e3324f50912792d76bdda 100644 +index 0c7fa826ee3f7a0851b49487484eb2ca39d9fcd7..2cd5ddcd99e77b6e28469a84d6b171b0c099819e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3540,7 +3540,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0777-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0777-Correctly-shrink-items-during-EntityResurrectEvent.patch index 4f1878d015..f16e8a752f 100644 --- a/patches/server/0777-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/server/0777-Correctly-shrink-items-during-EntityResurrectEvent.patch @@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem of undying was found and the event was called uncancelled. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b2c94edf9e1161aa97aa56f4124d96bd6a9b42ce..ff583a2c502f700b60cfe4a7fc341744d86f1c32 100644 +index cdd94eb9b82bb22505461ae135d12914d7446b00..1c67dafa4a54513d2f8febd13124ea5c976b313e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1683,7 +1683,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0781-Add-Entity-Body-Yaw-API.patch b/patches/server/0781-Add-Entity-Body-Yaw-API.patch index 94ea45be9c..2a54a79069 100644 --- a/patches/server/0781-Add-Entity-Body-Yaw-API.patch +++ b/patches/server/0781-Add-Entity-Body-Yaw-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index ca9cda9059a5c1dae1ca9ec09248768274d4e207..e65d1ca701d835db0ed45e627c92c1c5ed384887 100644 +index 087bf6f78457308488d52db04cac32d3a9dec4a8..38f8831306a0f9e623de27d1ff9ef26698859636 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1179,6 +1179,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1175,6 +1175,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } // Paper end - entity powdered snow API @@ -43,7 +43,7 @@ index ca9cda9059a5c1dae1ca9ec09248768274d4e207..e65d1ca701d835db0ed45e627c92c1c5 @Override public boolean isInvisible() { // Paper - moved up from LivingEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 8bda60a24c25d7a529f8ef1c70ea2442f76e1bfe..c0055944fc769053141e6bb3d7db80cdd20651fd 100644 +index 812194dac108e446cd987c474ec6e582eaaed32b..cf388e227cd5893619ab5d05fee4a43c00ba0d9a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1211,4 +1211,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0787-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0787-Fix-advancement-triggers-for-entity-damage.patch index 0d65a991f4..ce38a29549 100644 --- a/patches/server/0787-Fix-advancement-triggers-for-entity-damage.patch +++ b/patches/server/0787-Fix-advancement-triggers-for-entity-damage.patch @@ -23,7 +23,7 @@ index 2fb95271a161a30ce6f8ce40cc75470db3d03c4a..c838dc018fad67ae0a9b602a3b477aae return !this.getResponse(); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ff583a2c502f700b60cfe4a7fc341744d86f1c32..94ade049fa74f1e9e417c891453f50b203fe9b6c 100644 +index 1c67dafa4a54513d2f8febd13124ea5c976b313e..4e0eb1f0103823a764c184142744a290c0ebed53 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2475,7 +2475,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0793-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0793-Treat-sequence-violations-like-they-should-be.patch index 4ecf74bd4c..68d70efd4d 100644 --- a/patches/server/0793-Treat-sequence-violations-like-they-should-be.patch +++ b/patches/server/0793-Treat-sequence-violations-like-they-should-be.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 16cb1ed6b47972a6bf6e3324f50912792d76bdda..b16e08834bc63260a56b33fbfb89a46c9971a042 100644 +index 2cd5ddcd99e77b6e28469a84d6b171b0c099819e..0545414171c65531a39d6c4f4f3ea669bd8214ee 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2058,6 +2058,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0794-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0794-Prevent-causing-expired-keys-from-impacting-new-join.patch index a0f4624f76..f86d440282 100644 --- a/patches/server/0794-Prevent-causing-expired-keys-from-impacting-new-join.patch +++ b/patches/server/0794-Prevent-causing-expired-keys-from-impacting-new-join.patch @@ -26,7 +26,7 @@ index ef33705588abf550e2b3d0bf795788516141b3df..6bfb83434a184e6fdba932f692281f03 UPDATE_GAME_MODE((serialized, buf) -> serialized.gameMode = GameType.byId(buf.readVarInt()), (buf, entry) -> buf.writeVarInt(entry.gameMode().getId())), UPDATE_LISTED((serialized, buf) -> serialized.listed = buf.readBoolean(), (buf, entry) -> buf.writeBoolean(entry.listed())), diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b16e08834bc63260a56b33fbfb89a46c9971a042..888d41499c3a2186e4bd17d97372399f31d62ceb 100644 +index 0545414171c65531a39d6c4f4f3ea669bd8214ee..13b71e5572f68f5992bc95638c11a4f6a8e18099 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -307,6 +307,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0804-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0804-Refresh-ProjectileSource-for-projectiles.patch index af3a59f5ba..4d8e3cc45f 100644 --- a/patches/server/0804-Refresh-ProjectileSource-for-projectiles.patch +++ b/patches/server/0804-Refresh-ProjectileSource-for-projectiles.patch @@ -14,7 +14,7 @@ clearing the owner. Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bea167afbdd3a2f54b00c3abdb840014313fd239..7fb2bfa378169fac65c4d889c8174fb5ed945c55 100644 +index 5b2341e07d66feb4a3975eb2eb6208306c3ebaa9..29804084c93af884aea92d25b05e9bf20b92b620 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -394,6 +394,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0812-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0812-Add-method-to-remove-all-active-potion-effects.patch index 3b68adf163..21ed7d09a9 100644 --- a/patches/server/0812-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/server/0812-Add-method-to-remove-all-active-potion-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index c0055944fc769053141e6bb3d7db80cdd20651fd..c8422ceecc7ba3cb2e28616949790bf44cef7213 100644 +index cf388e227cd5893619ab5d05fee4a43c00ba0d9a..cbcd3563d1fda1038f9113da6ff88db9507a0f02 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -573,6 +573,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0818-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0818-Don-t-load-chunks-for-supporting-block-checks.patch index 6981c53f68..c00de60113 100644 --- a/patches/server/0818-Don-t-load-chunks-for-supporting-block-checks.patch +++ b/patches/server/0818-Don-t-load-chunks-for-supporting-block-checks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7fb2bfa378169fac65c4d889c8174fb5ed945c55..e11893db9dbe2731e6e15860d51a485b0422094d 100644 +index 29804084c93af884aea92d25b05e9bf20b92b620..d3457d9576dcacb0adbcc1884a407d5b24680563 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1242,7 +1242,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0829-Implement-PlayerFailMoveEvent.patch b/patches/server/0829-Implement-PlayerFailMoveEvent.patch index 46b0f7676b..bc287c4f27 100644 --- a/patches/server/0829-Implement-PlayerFailMoveEvent.patch +++ b/patches/server/0829-Implement-PlayerFailMoveEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 888d41499c3a2186e4bd17d97372399f31d62ceb..b0184fffd9703c6f9a89f6614d6c176a484a471a 100644 +index 13b71e5572f68f5992bc95638c11a4f6a8e18099..ed68a02dc3f3265b3a2c911767186a1268ea7212 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1325,8 +1325,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0830-Folia-scheduler-and-owned-region-API.patch b/patches/server/0830-Folia-scheduler-and-owned-region-API.patch index 51c039105e..4b9bab8c95 100644 --- a/patches/server/0830-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0830-Folia-scheduler-and-owned-region-API.patch @@ -1185,7 +1185,7 @@ index 7da3e315de67f3273997ce9160995183a3a1ce71..3a6e918e9db6397b6f1cff5310416552 this.players.remove(entityplayer); this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e11893db9dbe2731e6e15860d51a485b0422094d..293994cb737af5f55ff9bab9fb6b09aca2d75c44 100644 +index d3457d9576dcacb0adbcc1884a407d5b24680563..c7292ddae2a2cb11434a6962706bc2a8dd5d2cdc 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -263,10 +263,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -1342,7 +1342,7 @@ index 5c907eca23d936ba3095f2d81256775edaa737da..4c4fa7bbafb075beb0d9c1ef21e3ba2d ConfigurationSerialization.registerClass(CraftOfflinePlayer.class); ConfigurationSerialization.registerClass(CraftPlayerProfile.class); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index e65d1ca701d835db0ed45e627c92c1c5ed384887..211726898275788e593002a279bf007c916de4de 100644 +index 38f8831306a0f9e623de27d1ff9ef26698859636..f3788ae79abfb1dd82a5c638d9b7850c7006b658 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -71,6 +71,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0843-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0843-API-for-an-entity-s-scoreboard-name.patch index 703131ac85..fcbfdfdf4c 100644 --- a/patches/server/0843-API-for-an-entity-s-scoreboard-name.patch +++ b/patches/server/0843-API-for-an-entity-s-scoreboard-name.patch @@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different methods depending on the implementation of Entity you were working with. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 211726898275788e593002a279bf007c916de4de..547a485559b40411c2e91fecd3e83075dfc80241 100644 +index f3788ae79abfb1dd82a5c638d9b7850c7006b658..56a3c69bb37b90b7af6590027a80d20f4812bef4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1259,4 +1259,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1255,4 +1255,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return !this.getHandle().level().noCollision(this.getHandle(), aabb); } // Paper end - Collision API diff --git a/patches/server/0845-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0845-Don-t-tab-complete-namespaced-commands-if-send-names.patch index 43397fa7f0..8c20d499c8 100644 --- a/patches/server/0845-Don-t-tab-complete-namespaced-commands-if-send-names.patch +++ b/patches/server/0845-Don-t-tab-complete-namespaced-commands-if-send-names.patch @@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player requests tab-complete only commands. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b0184fffd9703c6f9a89f6614d6c176a484a471a..5674852a8be42c4a411858ad3b55dbfa0e5254c6 100644 +index ed68a02dc3f3265b3a2c911767186a1268ea7212..a2c404e4cd808a3a676ae3808852e4105bdc9af4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -830,6 +830,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0849-Add-Listing-API-for-Player.patch b/patches/server/0849-Add-Listing-API-for-Player.patch index 8cee363b3a..f3d2578ca6 100644 --- a/patches/server/0849-Add-Listing-API-for-Player.patch +++ b/patches/server/0849-Add-Listing-API-for-Player.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Listing API for Player diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java -index 6bfb83434a184e6fdba932f692281f0303ada65f..8074d7e84a2f3f868920392896828b31bb90bd5d 100644 +index 6bfb83434a184e6fdba932f692281f0303ada65f..e2541a3886504b143f858a4e75ac4746d4d39e28 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java @@ -38,6 +38,17 @@ public class ClientboundPlayerInfoUpdatePacket implements Packet { this.containerSynchronizer.sendSlotChange(this.containerMenu, s, this.getMainHandItem()); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9230afb0c75133a51e99545b160333ace6036075..4db3e4f87487428e598046b953d083f3323cf9f1 100644 +index 755b43f5b247361f234430e1fd40a662415540c3..c892e12ea0d6408bde20402f18868d4d3f3e4f65 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2812,10 +2812,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -40,7 +40,7 @@ index 9230afb0c75133a51e99545b160333ace6036075..4db3e4f87487428e598046b953d083f3 if (event.isCancelled()) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e47440d9b166b1d3512ab84e1427828cf0fb81f8..efe093a1215386d5ff69c15170a841ea4f3a52b4 100644 +index aa317a143e2c38a0385a83651a78403401a75d9e..1c070437ef763b56791d61b8c36e623c3dc80649 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2783,8 +2783,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0865-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0865-Add-slot-sanity-checks-in-container-clicks.patch index 4280513c2d..94577c894d 100644 --- a/patches/server/0865-Add-slot-sanity-checks-in-container-clicks.patch +++ b/patches/server/0865-Add-slot-sanity-checks-in-container-clicks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4db3e4f87487428e598046b953d083f3323cf9f1..50c4ecabdea7dafbb7ecdf226cac7d55a50b9e64 100644 +index c892e12ea0d6408bde20402f18868d4d3f3e4f65..76fdf92b933b5fbb21eb511932fdf8e299a44377 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3075,6 +3075,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0886-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0886-Broadcast-take-item-packets-with-collector-as-source.patch index a34fde6c5c..bbba71fa10 100644 --- a/patches/server/0886-Broadcast-take-item-packets-with-collector-as-source.patch +++ b/patches/server/0886-Broadcast-take-item-packets-with-collector-as-source.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Broadcast take item packets with collector as source This fixes players (which can't view the collector) seeing item pickups with themselves as the target. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 94ade049fa74f1e9e417c891453f50b203fe9b6c..66c9df4085d004b8a83ce0da954b380c7e5085a6 100644 +index 4e0eb1f0103823a764c184142744a290c0ebed53..70574115423d95c9efabf77e4113e65e81f8c0d1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3903,7 +3903,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0892-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0892-Fix-missing-event-call-for-entity-teleport-API.patch index 7f89636154..aeff852db4 100644 --- a/patches/server/0892-Fix-missing-event-call-for-entity-teleport-API.patch +++ b/patches/server/0892-Fix-missing-event-call-for-entity-teleport-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing event call for entity teleport API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 7cd929d4b9ab60a585c2316b949fce2a0e97e467..2b1f3e27ce5cecc94297c27debe5e3bd64c08967 100644 +index 27c8850f874040ba00fa4c226ca0662261451826..71dfa030136492bfb03bfedc4f0d36eef5d67856 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -259,6 +259,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0894-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0894-Don-t-fire-sync-events-during-worldgen.patch index b725d65f7e..a8e936d27c 100644 --- a/patches/server/0894-Don-t-fire-sync-events-during-worldgen.patch +++ b/patches/server/0894-Don-t-fire-sync-events-during-worldgen.patch @@ -31,7 +31,7 @@ index 1197788c4e0cc8740e69cfcc36d731bf6bc9fcb1..97f1722ed5566dcb8c7e0ccdefea1f89 if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable()); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index efe093a1215386d5ff69c15170a841ea4f3a52b4..a84e80f53418a759de5e4e364be6530e0996fd1b 100644 +index 1c070437ef763b56791d61b8c36e623c3dc80649..ea4a31e08452a311798ace8554cfa16e41acf15c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -632,7 +632,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -68,7 +68,7 @@ index 979c99851ccb363d889069bafa5b5f7eb6b1a436..2cd74db8e3c51c97a2abcb801bb5c15c }, () -> { EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id")); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 66c9df4085d004b8a83ce0da954b380c7e5085a6..e723098bbba695e6919c5d0cc185dfb710f52606 100644 +index 70574115423d95c9efabf77e4113e65e81f8c0d1..1618c415f5f9b356206f0e2f1474545f31dfbb01 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1159,6 +1159,11 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0897-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0897-Restore-vanilla-entity-drops-behavior.patch index bdd4fbdc29..2ba631968a 100644 --- a/patches/server/0897-Restore-vanilla-entity-drops-behavior.patch +++ b/patches/server/0897-Restore-vanilla-entity-drops-behavior.patch @@ -37,7 +37,7 @@ index 4c49a7a5dc702e1ab2d1b12f41af7c9ce1368e06..d82a22d9ef5a7f649d424c01e88a1209 loot.addAll(this.drops); this.drops.clear(); // SPIGOT-5188: make sure to clear diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a84e80f53418a759de5e4e364be6530e0996fd1b..7c102523d44fd07d3d31b09203e36ab3b9ef472f 100644 +index ea4a31e08452a311798ace8554cfa16e41acf15c..c5724826fade3ade6fea3d4f6173b46fdeaf9679 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2704,19 +2704,45 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -89,7 +89,7 @@ index a84e80f53418a759de5e4e364be6530e0996fd1b..7c102523d44fd07d3d31b09203e36ab3 return this.spawnAtLocation(world, entityitem); } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e723098bbba695e6919c5d0cc185dfb710f52606..5d879efbb460ecca9a8ffc570d384a96898dada1 100644 +index 1618c415f5f9b356206f0e2f1474545f31dfbb01..d32e5b1aa7549751e192b79c238c1832d6e9e605 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -287,7 +287,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0901-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0901-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch index 764d6afb4b..77af9e78a8 100644 --- a/patches/server/0901-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch +++ b/patches/server/0901-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch @@ -26,7 +26,7 @@ index c6dcc37ac5fcf50bcb246f533b99983dfc5c19c2..c13b6f14c3061710c2b27034db240cc9 d3 = to.getX(); d4 = to.getY(); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5d879efbb460ecca9a8ffc570d384a96898dada1..23c9ef6dd0bb73bcf6af0e9b581bad72abe8bf22 100644 +index d32e5b1aa7549751e192b79c238c1832d6e9e605..2715ba6325ecf82dee237bb53372e3aac3972112 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -4371,7 +4371,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0905-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0905-Validate-ResourceLocation-in-NBT-reading.patch index 581b677a3c..64686a7ba9 100644 --- a/patches/server/0905-Validate-ResourceLocation-in-NBT-reading.patch +++ b/patches/server/0905-Validate-ResourceLocation-in-NBT-reading.patch @@ -85,7 +85,7 @@ index 68b869c5d76aeb390a05b053eef70486bd4126fd..48f89ec0f02b85092d03fddeec961f1e if (nbt.contains("leash", 11)) { Either either = (Either) NbtUtils.readBlockPos(nbt, "leash").map(Either::right).orElse(null); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 23c9ef6dd0bb73bcf6af0e9b581bad72abe8bf22..b5b156b9f7a4a0d43715fe82957864bebf1cceb2 100644 +index 2715ba6325ecf82dee237bb53372e3aac3972112..95c2e2d73aefcf7c436fad3066e1fedc7299faa1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -909,11 +909,13 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0912-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0912-Add-api-for-spawn-egg-texture-colors.patch index 06c48b56ae..e75dc4c961 100644 --- a/patches/server/0912-Add-api-for-spawn-egg-texture-colors.patch +++ b/patches/server/0912-Add-api-for-spawn-egg-texture-colors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add api for spawn egg texture colors diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 066d8f0592fa4fc9886eab7ca1ba1151b3748b95..663d3a2e4f2eb4d30a0fbde2a05445cf3ed88810 100644 +index 066d8f0592fa4fc9886eab7ca1ba1151b3748b95..44abd5742f2682b6224d6de90d52312000d20429 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -637,6 +637,15 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -637,6 +637,18 @@ public final class CraftMagicNumbers implements UnsafeValues { } // Paper end @@ -17,7 +17,10 @@ index 066d8f0592fa4fc9886eab7ca1ba1151b3748b95..663d3a2e4f2eb4d30a0fbde2a05445cf + public org.bukkit.Color getSpawnEggLayerColor(final EntityType entityType, final int layer) { + final net.minecraft.world.entity.EntityType nmsType = org.bukkit.craftbukkit.entity.CraftEntityType.bukkitToMinecraft(entityType); + final net.minecraft.world.item.SpawnEggItem eggItem = net.minecraft.world.item.SpawnEggItem.byId(nmsType); -+ return eggItem == null ? null : org.bukkit.Color.fromRGB(eggItem.getColor(layer)); ++ if (eggItem != null) { ++ throw new UnsupportedOperationException("Not yet implemented"); ++ } ++ return eggItem == null ? null : org.bukkit.Color.fromRGB(1); // TODO + } + // Paper end - spawn egg color visibility + diff --git a/patches/server/0913-Add-Lifecycle-Event-system.patch b/patches/server/0913-Add-Lifecycle-Event-system.patch index 18311c4a1d..c6d462c4f3 100644 --- a/patches/server/0913-Add-Lifecycle-Event-system.patch +++ b/patches/server/0913-Add-Lifecycle-Event-system.patch @@ -743,10 +743,10 @@ index eaea08530ca864158a2fa15dca38ca0c25a49bde..b4a823a62d7088262b7f799c977aec71 this.reloadCount++; this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile()); diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 663d3a2e4f2eb4d30a0fbde2a05445cf3ed88810..4bec6593dbda01199c8d13515c4c2ae7f489438d 100644 +index 44abd5742f2682b6224d6de90d52312000d20429..0debfd0f95c063566280556dbd755c717e3aa266 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -646,6 +646,13 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -649,6 +649,13 @@ public final class CraftMagicNumbers implements UnsafeValues { } // Paper end - spawn egg color visibility diff --git a/patches/server/0914-ItemStack-Tooltip-API.patch b/patches/server/0914-ItemStack-Tooltip-API.patch index e6a4e7549a..3f3d1ceb3a 100644 --- a/patches/server/0914-ItemStack-Tooltip-API.patch +++ b/patches/server/0914-ItemStack-Tooltip-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack Tooltip API diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 4bec6593dbda01199c8d13515c4c2ae7f489438d..565b2474a7f511d1635aa80b7f1eaa6452b0f2a2 100644 +index 0debfd0f95c063566280556dbd755c717e3aa266..0e2d9de778e9747d0c2ab897d36c623d2ffbeb95 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -635,6 +635,19 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0922-Add-CartographyItemEvent.patch b/patches/server/0922-Add-CartographyItemEvent.patch index babd3f5bdc..c1a1f073cb 100644 --- a/patches/server/0922-Add-CartographyItemEvent.patch +++ b/patches/server/0922-Add-CartographyItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add CartographyItemEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 50c4ecabdea7dafbb7ecdf226cac7d55a50b9e64..478911bb39e276e7734b4a82f1c0fa38d43e30df 100644 +index 76fdf92b933b5fbb21eb511932fdf8e299a44377..e9478fed28995a3ce5527e80232203eed503104c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3197,6 +3197,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0929-Fix-DamageSource-API.patch b/patches/server/0929-Fix-DamageSource-API.patch index bf88ee3716..7cffc77010 100644 --- a/patches/server/0929-Fix-DamageSource-API.patch +++ b/patches/server/0929-Fix-DamageSource-API.patch @@ -84,7 +84,7 @@ index fddbdb7322a2063996a28c5c3d93c265188b1256..be87cb3cfa15a7d889118cdc4b87232e public DamageSource sonicBoom(Entity attacker) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7c102523d44fd07d3d31b09203e36ab3b9ef472f..8985fa033b8595989dccfd44db95f4ef298fc314 100644 +index c5724826fade3ade6fea3d4f6173b46fdeaf9679..cd0c72dbf026630eae7d479f532c5de7b0606988 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3419,7 +3419,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0932-Improve-tag-parser-handling.patch b/patches/server/0932-Improve-tag-parser-handling.patch index 79e7dbe97a..6902b54527 100644 --- a/patches/server/0932-Improve-tag-parser-handling.patch +++ b/patches/server/0932-Improve-tag-parser-handling.patch @@ -252,7 +252,7 @@ index 898b19887ed34c87003fc63cb5905df2ba6234a5..b47eeb23055b135d5567552ba983bfbc private void write(FriendlyByteBuf buf) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 478911bb39e276e7734b4a82f1c0fa38d43e30df..cb02272523f7e033184cd7517e5f4de76eef10fd 100644 +index e9478fed28995a3ce5527e80232203eed503104c..a13c199446423dbc807f916157bb7cac33229389 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -776,6 +776,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0935-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0935-Properly-track-the-changed-item-from-dispense-events.patch index 06f8ab7f18..8e7c716f12 100644 --- a/patches/server/0935-Properly-track-the-changed-item-from-dispense-events.patch +++ b/patches/server/0935-Properly-track-the-changed-item-from-dispense-events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Properly track the changed item from dispense events diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java -index e17436e07eaec76e766c94ecdffc8043fbe42340..9246ec011c7d94618c0aa73792d1bef8f447c88c 100644 +index e17436e07eaec76e766c94ecdffc8043fbe42340..56631b08b58aac5801b55d4efc948c6617e812ff 100644 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java @@ -129,10 +129,14 @@ public interface DispenseItemBehavior { @@ -14,7 +14,7 @@ index e17436e07eaec76e766c94ecdffc8043fbe42340..9246ec011c7d94618c0aa73792d1bef8 } + // Paper start - track changed items in the dispense event + itemstack1 = CraftItemStack.unwrap(event.getItem()); // unwrap is safe because the stack won't be modified -+ entitytypes = ((SpawnEggItem) itemstack1.getItem()).getType(itemstack1); ++ entitytypes = ((SpawnEggItem) itemstack1.getItem()).getType(worldserver.registryAccess(), itemstack1); + // Paper end - track changed item from dispense event } diff --git a/patches/server/0940-Fix-shield-disable-inconsistency.patch b/patches/server/0940-Fix-shield-disable-inconsistency.patch index 6d8f773b8b..be86c1bbee 100644 --- a/patches/server/0940-Fix-shield-disable-inconsistency.patch +++ b/patches/server/0940-Fix-shield-disable-inconsistency.patch @@ -8,7 +8,7 @@ it will not disable the shield if the attacker is holding an axe item. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b5b156b9f7a4a0d43715fe82957864bebf1cceb2..c095e535039254d4d56fb7b1a7bc00cd4d0f3cda 100644 +index 95c2e2d73aefcf7c436fad3066e1fedc7299faa1..5b0dcb27cb862e84478b94184b7a1b97fb2e7501 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2436,7 +2436,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0944-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0944-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch index 5f2d311241..7944a47a7b 100644 --- a/patches/server/0944-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch +++ b/patches/server/0944-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Revert to vanilla handling of LivingEntity#actuallyHurt diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c095e535039254d4d56fb7b1a7bc00cd4d0f3cda..86858ce769c6eea48a4e1c89f395350e962df069 100644 +index 5b0dcb27cb862e84478b94184b7a1b97fb2e7501..1bb38e6c6a02839fbe72584e91504dfaca3c46e9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1455,7 +1455,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0951-Brigadier-based-command-API.patch b/patches/server/0951-Brigadier-based-command-API.patch index 5b5b502989..15fcb1647a 100644 --- a/patches/server/0951-Brigadier-based-command-API.patch +++ b/patches/server/0951-Brigadier-based-command-API.patch @@ -2328,7 +2328,7 @@ index ebe6a002d883721d80cbfcc004064e8a57934a56..cce0e570c8217c8e7cc81642d303e1b9 this.setPvpAllowed(dedicatedserverproperties.pvp); this.setFlightAllowed(dedicatedserverproperties.allowFlight); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cb02272523f7e033184cd7517e5f4de76eef10fd..941c091309a836661bb6e82f37d9fba82e3c5004 100644 +index a13c199446423dbc807f916157bb7cac33229389..929cd59b8f27d7b708054d80e764a11d6551f060 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2489,30 +2489,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0953-Fix-equipment-slot-and-group-API.patch b/patches/server/0953-Fix-equipment-slot-and-group-API.patch index c6071fc694..c01f208839 100644 --- a/patches/server/0953-Fix-equipment-slot-and-group-API.patch +++ b/patches/server/0953-Fix-equipment-slot-and-group-API.patch @@ -10,7 +10,7 @@ Adds the following: Co-authored-by: SoSeDiK diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index c8422ceecc7ba3cb2e28616949790bf44cef7213..db0253c545bd06f872dd8b7b105fe4398980b173 100644 +index cbcd3563d1fda1038f9113da6ff88db9507a0f02..ef8c549a1536bfc451871f1a92eea45186821f97 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1230,4 +1230,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0955-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0955-Prevent-sending-oversized-item-data-in-equipment-and.patch index 533e2f8709..90fbb4d39e 100644 --- a/patches/server/0955-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/0955-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -209,7 +209,7 @@ index ce3e359ed2b29674aa89a714ee1fb0875d83595d..d5bc702f2676b1b7a32c8f3a4a349fc2 ((LivingEntity) this.entity).detectEquipmentUpdatesPublic(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 941c091309a836661bb6e82f37d9fba82e3c5004..cacf577b072245d71dc783c8126fc8569c8003e5 100644 +index 929cd59b8f27d7b708054d80e764a11d6551f060..1afe77b2aea43a51e2e99284c86d93a5bd4d1ee7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2817,7 +2817,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -222,7 +222,7 @@ index 941c091309a836661bb6e82f37d9fba82e3c5004..cacf577b072245d71dc783c8126fc856 ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - fix slot desync - always refresh player inventory diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 86858ce769c6eea48a4e1c89f395350e962df069..be8db026f1a84ddc9c43be3c4aa84b09581c5401 100644 +index 1bb38e6c6a02839fbe72584e91504dfaca3c46e9..696a75ef6695896358ffcbef44a3a59eb97544fb 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3472,7 +3472,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0959-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0959-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch index 68600be598..6eb5d6714d 100644 --- a/patches/server/0959-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch +++ b/patches/server/0959-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate InvAction#HOTBAR_MOVE_AND_READD diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cacf577b072245d71dc783c8126fc8569c8003e5..d99ad1200bfd2621d21184b0f106a255ba009ba6 100644 +index 1afe77b2aea43a51e2e99284c86d93a5bd4d1ee7..bef4687218c4ee7a7c03a7027fb92fcad403c37c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3089,14 +3089,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0965-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0965-Configurable-damage-tick-when-blocking-with-shield.patch index 2b83cd017c..15084ae211 100644 --- a/patches/server/0965-Configurable-damage-tick-when-blocking-with-shield.patch +++ b/patches/server/0965-Configurable-damage-tick-when-blocking-with-shield.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable damage tick when blocking with shield diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index be8db026f1a84ddc9c43be3c4aa84b09581c5401..587645818563e277157637723e4d8c21f8cd712d 100644 +index 696a75ef6695896358ffcbef44a3a59eb97544fb..4eed8d90a8879e731ac9d7ae80d9b650fdcf4408 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2498,7 +2498,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0973-Entity-Activation-Range-2.0.patch b/patches/server/0973-Entity-Activation-Range-2.0.patch index c24b4fd836..173bdc6c8d 100644 --- a/patches/server/0973-Entity-Activation-Range-2.0.patch +++ b/patches/server/0973-Entity-Activation-Range-2.0.patch @@ -89,7 +89,7 @@ index abd416ecf8b9e847d80704f13a5076f61ed846ef..459fb89295bce269b4f36fccc5e8acfc } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8985fa033b8595989dccfd44db95f4ef298fc314..1b3a6f79204b55117319f477f1e99a8c15c812c2 100644 +index cd0c72dbf026630eae7d479f532c5de7b0606988..4848898823410009cf47e2a58f3d162006fd8b54 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -421,6 +421,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0976-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0976-Optimize-Collision-to-not-load-chunks.patch index cb0103ec86..62ee13c684 100644 --- a/patches/server/0976-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0976-Optimize-Collision-to-not-load-chunks.patch @@ -15,20 +15,8 @@ massive amounts of surrounding chunks due to large AABB lookups. Feature patch -diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 3e03d65ac4ef267de67684d24c6f9c303b1a0bf0..b451842d6848af883cc3abf200f03c9a4680106c 100644 ---- a/src/main/java/net/minecraft/server/players/PlayerList.java -+++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -826,6 +826,7 @@ public abstract class PlayerList { - Vec3 vec3d = teleporttransition.position(); - - entityplayer1.forceSetPositionRotation(vec3d.x, vec3d.y, vec3d.z, teleporttransition.yRot(), teleporttransition.xRot()); -+ worldserver.getChunkSource().addRegionTicket(net.minecraft.server.level.TicketType.POST_TELEPORT, new net.minecraft.world.level.ChunkPos(net.minecraft.util.Mth.floor(vec3d.x()) >> 4, net.minecraft.util.Mth.floor(vec3d.z()) >> 4), 1, entityplayer.getId()); // Paper - // CraftBukkit end - if (teleporttransition.missingRespawnBlock()) { - entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F)); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1b3a6f79204b55117319f477f1e99a8c15c812c2..4e2754d28fc387987a191f28910f3bbefa36e724 100644 +index 4848898823410009cf47e2a58f3d162006fd8b54..4f43f7892debfb59308d81b2647867c8b1f1b007 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -259,6 +259,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0985-Check-distance-in-entity-interactions.patch b/patches/server/0985-Check-distance-in-entity-interactions.patch index cd71d48d64..a48c51dc13 100644 --- a/patches/server/0985-Check-distance-in-entity-interactions.patch +++ b/patches/server/0985-Check-distance-in-entity-interactions.patch @@ -18,7 +18,7 @@ index cc5e2710d3edeaf60284ed95c33999c701d0678a..1a31024b46a5d7960f1e0f172f8ebcf3 }; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 587645818563e277157637723e4d8c21f8cd712d..16fdc55c398f1ce07fbcb09c386c7f3703c9bd68 100644 +index 4eed8d90a8879e731ac9d7ae80d9b650fdcf4408..bf6ca618801cb0bb21792773b415fdd92a0d48e4 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1467,7 +1467,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0987-Properly-resend-entities.patch b/patches/server/0987-Properly-resend-entities.patch index 5fae130fa5..851bda3edc 100644 --- a/patches/server/0987-Properly-resend-entities.patch +++ b/patches/server/0987-Properly-resend-entities.patch @@ -83,7 +83,7 @@ index f2dd272a01b4e946a6746865d55ebc9861f8361b..5d189ba60d40f5c42b2dacc339594ed0 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d99ad1200bfd2621d21184b0f106a255ba009ba6..0319ec3689f2fdb23bdcfa6f93e9a471b42c04b0 100644 +index bef4687218c4ee7a7c03a7027fb92fcad403c37c..43cf3510750ca3a1be8c61afaa94b0f8e2127eb5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2025,6 +2025,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -104,7 +104,7 @@ index d99ad1200bfd2621d21184b0f106a255ba009ba6..0319ec3689f2fdb23bdcfa6f93e9a471 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b451842d6848af883cc3abf200f03c9a4680106c..88299abf563a041ade1683b66b43103b0eeeea0d 100644 +index 3e03d65ac4ef267de67684d24c6f9c303b1a0bf0..c7429a386df96a4b03c4c840ca9bd5b37d58ffc3 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -396,7 +396,7 @@ public abstract class PlayerList { @@ -116,7 +116,7 @@ index b451842d6848af883cc3abf200f03c9a4680106c..88299abf563a041ade1683b66b43103b this.sendLevelInfo(player, worldserver1); -@@ -907,12 +907,17 @@ public abstract class PlayerList { +@@ -906,12 +906,17 @@ public abstract class PlayerList { } public void sendActiveEffects(LivingEntity entity, ServerGamePacketListenerImpl networkHandler) { @@ -136,7 +136,7 @@ index b451842d6848af883cc3abf200f03c9a4680106c..88299abf563a041ade1683b66b43103b } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4e2754d28fc387987a191f28910f3bbefa36e724..1167e3a378bf2f83848e3a732d407d6e5e689743 100644 +index 4f43f7892debfb59308d81b2647867c8b1f1b007..89e898e14c0a6388bbd76a2f74828cf6cd46e7a9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -599,13 +599,45 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -188,7 +188,7 @@ index 4e2754d28fc387987a191f28910f3bbefa36e724..1167e3a378bf2f83848e3a732d407d6e public boolean equals(Object object) { return object instanceof Entity ? ((Entity) object).id == this.id : false; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 16fdc55c398f1ce07fbcb09c386c7f3703c9bd68..11f2176ce70fd2e0c323906d39fac95b75e10551 100644 +index bf6ca618801cb0bb21792773b415fdd92a0d48e4..902b756a05bee72573102111ddd6f7b225277171 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -4037,6 +4037,11 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -284,7 +284,7 @@ index 04760d8ba7c560bd9d11191c666715ae8c3e4bff..021169d709964b1bb65e49bf3fcf3119 } // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 2b1f3e27ce5cecc94297c27debe5e3bd64c08967..d1d9916db7bd4886d30355e6a0ecb69cd21c2364 100644 +index 71dfa030136492bfb03bfedc4f0d36eef5d67856..53ee324f353e65e1b504efeb1d0a3876b0e63991 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1008,7 +1008,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0990-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/0990-Proxy-ItemStack-to-CraftItemStack.patch index 298bd2afb6..0319169c3a 100644 --- a/patches/server/0990-Proxy-ItemStack-to-CraftItemStack.patch +++ b/patches/server/0990-Proxy-ItemStack-to-CraftItemStack.patch @@ -205,10 +205,10 @@ index 6cc9d7a9e6d4bfdc27e52fc581b2bb832616f121..6930d0afb230a88aa813b02e4d55c95d + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 565b2474a7f511d1635aa80b7f1eaa6452b0f2a2..52d3f5159b2d55c0f2adc2b882046909ecb52222 100644 +index 0e2d9de778e9747d0c2ab897d36c623d2ffbeb95..92aeb48e565304d12a359d00f70e9bc3046419ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -666,6 +666,13 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -669,6 +669,13 @@ public final class CraftMagicNumbers implements UnsafeValues { } // Paper end - lifecycle event API diff --git a/patches/server/0996-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/0996-Only-call-EntityDamageEvents-before-actuallyHurt.patch index 6ab98e87f7..e031f18dd9 100644 --- a/patches/server/0996-Only-call-EntityDamageEvents-before-actuallyHurt.patch +++ b/patches/server/0996-Only-call-EntityDamageEvents-before-actuallyHurt.patch @@ -12,7 +12,7 @@ This patch moves the invocation directly before the #actuallyHurt calls, respective invulnerable timings. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 11f2176ce70fd2e0c323906d39fac95b75e10551..5a5a79e237eb36b67e0b373840f0084b9dbf3954 100644 +index 902b756a05bee72573102111ddd6f7b225277171..71691b3fbb8d48acb1b4e7268d46b0d094aea056 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1489,12 +1489,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0999-Make-interaction-leniency-distance-configurable.patch b/patches/server/0999-Make-interaction-leniency-distance-configurable.patch index 180b354d30..1a4f18e925 100644 --- a/patches/server/0999-Make-interaction-leniency-distance-configurable.patch +++ b/patches/server/0999-Make-interaction-leniency-distance-configurable.patch @@ -12,7 +12,7 @@ This value however may be too low in high latency environments. The patch exposes a new configuration option to configure said value. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0319ec3689f2fdb23bdcfa6f93e9a471b42c04b0..88a8d867b6ddee037c0c0482f903961f681479c6 100644 +index 43cf3510750ca3a1be8c61afaa94b0f8e2127eb5..a582eeaa63a4f5018898fc9a1f9a5efb2664fa59 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2788,7 +2788,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/1006-Leashable-API.patch b/patches/server/1006-Leashable-API.patch index 8c073cfcde..f616274a77 100644 --- a/patches/server/1006-Leashable-API.patch +++ b/patches/server/1006-Leashable-API.patch @@ -74,7 +74,7 @@ index ff82dc98478a8ac564bdbf4ec58da612e5f6c2ce..2a2839c31989d127739d829159a8b6e5 public CraftBoat(CraftServer server, AbstractBoat entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index db0253c545bd06f872dd8b7b105fe4398980b173..bc8e52e3f2a1dccecdaea2719eacd127bf82ee09 100644 +index ef8c549a1536bfc451871f1a92eea45186821f97..4f98d138a275a6c34528b7a5148ef265bc38d6b5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -784,43 +784,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/1007-Fix-CraftBukkit-drag-system.patch b/patches/server/1007-Fix-CraftBukkit-drag-system.patch index ef7e04105b..bb1e764575 100644 --- a/patches/server/1007-Fix-CraftBukkit-drag-system.patch +++ b/patches/server/1007-Fix-CraftBukkit-drag-system.patch @@ -10,7 +10,7 @@ public net.minecraft.world.inventory.AbstractContainerMenu quickcraftType public net.minecraft.world.inventory.AbstractContainerMenu resetQuickCraft()V diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 88a8d867b6ddee037c0c0482f903961f681479c6..a28878b0fae589d81a7aeb13c2ab291f5d3e02af 100644 +index a582eeaa63a4f5018898fc9a1f9a5efb2664fa59..71a314d3d38df0e982aef631ce50bd3b27bd6b20 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3147,6 +3147,25 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/1011-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/server/1011-Fix-synchronise-sending-chat-to-client-with-updating.patch index fae7a30d19..7bde2621fa 100644 --- a/patches/server/1011-Fix-synchronise-sending-chat-to-client-with-updating.patch +++ b/patches/server/1011-Fix-synchronise-sending-chat-to-client-with-updating.patch @@ -9,7 +9,7 @@ In the case where multiple messages from different players are being processed i This also applies to the last seen state of the server, which becomes inconsistent in the same way as the message signature cache and would cause any messages sent to be rejected by the server too. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a28878b0fae589d81a7aeb13c2ab291f5d3e02af..82d6b4f6cefd946b234a8007c745c76a373694b3 100644 +index 71a314d3d38df0e982aef631ce50bd3b27bd6b20..12b2776dd0caa37214a025ea360a8e60e1783653 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2728,8 +2728,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/1014-Check-dead-flag-in-isAlive.patch b/patches/server/1014-Check-dead-flag-in-isAlive.patch index cb918a9c8a..99cf6fce62 100644 --- a/patches/server/1014-Check-dead-flag-in-isAlive.patch +++ b/patches/server/1014-Check-dead-flag-in-isAlive.patch @@ -15,7 +15,7 @@ Also, even if the plugin is responsibly checking !isDead() before modifying heal I am currently unable to replicate, these "revived" entities can still appear diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5a5a79e237eb36b67e0b373840f0084b9dbf3954..64047566eb3049918bb2721679835cfa574c9f13 100644 +index 71691b3fbb8d48acb1b4e7268d46b0d094aea056..75afe539b1dcb8cdccc0cad3c2b8974872e21a63 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2160,7 +2160,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/1015-Add-FeatureFlag-API.patch b/patches/server/1015-Add-FeatureFlag-API.patch index b1616669c8..3bb81a304c 100644 --- a/patches/server/1015-Add-FeatureFlag-API.patch +++ b/patches/server/1015-Add-FeatureFlag-API.patch @@ -29,10 +29,10 @@ index 0000000000000000000000000000000000000000..c6fd2e8a570ac474dd1751929137280c +} diff --git a/src/main/java/io/papermc/paper/world/flag/PaperFeatureFlagProviderImpl.java b/src/main/java/io/papermc/paper/world/flag/PaperFeatureFlagProviderImpl.java new file mode 100644 -index 0000000000000000000000000000000000000000..8a2fb217501bb6293adf54686420ef7d1ce2ec11 +index 0000000000000000000000000000000000000000..f70bc7833fc418e2374701a34337485c7d295150 --- /dev/null +++ b/src/main/java/io/papermc/paper/world/flag/PaperFeatureFlagProviderImpl.java -@@ -0,0 +1,55 @@ +@@ -0,0 +1,54 @@ +package io.papermc.paper.world.flag; + +import com.google.common.collect.BiMap; @@ -57,8 +57,7 @@ index 0000000000000000000000000000000000000000..8a2fb217501bb6293adf54686420ef7d + FeatureFlag.VANILLA, FeatureFlags.VANILLA, + FeatureFlag.TRADE_REBALANCE, FeatureFlags.TRADE_REBALANCE, + FeatureFlag.MINECART_IMPROVEMENTS, FeatureFlags.MINECART_IMPROVEMENTS, -+ FeatureFlag.REDSTONE_EXPERIMENTS, FeatureFlags.REDSTONE_EXPERIMENTS, -+ FeatureFlag.WINTER_DROP, FeatureFlags.WINTER_DROP ++ FeatureFlag.REDSTONE_EXPERIMENTS, FeatureFlags.REDSTONE_EXPERIMENTS + ); + + @Override @@ -284,7 +283,7 @@ index 6cf790c9fa23ea313423fdaeb7c181bf530828c6..0bcb9df1103050441f8922a688b163dc public static PotionEffectType minecraftHolderToBukkit(Holder minecraft) { return CraftPotionEffectType.minecraftToBukkit(minecraft.value()); diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 52d3f5159b2d55c0f2adc2b882046909ecb52222..95ea59e73aa3295811d628e124306af63a0cd6b4 100644 +index 92aeb48e565304d12a359d00f70e9bc3046419ca..869b0977a463d46ff7983f8d15c3c679027e7135 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -48,7 +48,7 @@ import org.bukkit.attribute.Attribute; diff --git a/patches/server/1017-Item-serialization-as-json.patch b/patches/server/1017-Item-serialization-as-json.patch index 6f53e6364f..df8590e623 100644 --- a/patches/server/1017-Item-serialization-as-json.patch +++ b/patches/server/1017-Item-serialization-as-json.patch @@ -28,7 +28,7 @@ index 17b6bd630e9767c5e9fa5ceff228fb81f124be8c..0a905a59d97ed833cb4f1903006d6f34 public static final Codec CODEC_WITH_ID = CODEC.validate( component -> component.getUnsafe().contains("id", 8) ? DataResult.success(component) : DataResult.error(() -> "Missing id for entity in: " + component) diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 95ea59e73aa3295811d628e124306af63a0cd6b4..0d5d14a9a817c00704728f65cd87e446a0caa3c3 100644 +index 869b0977a463d46ff7983f8d15c3c679027e7135..ffbb1763f245a97da58a7d9eae627e61ce200da4 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -527,6 +527,39 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/1021-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch b/patches/server/1021-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch index 3b1773edc3..233a823391 100644 --- a/patches/server/1021-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch +++ b/patches/server/1021-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerCommandPreprocessEvent on signed commands diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 82d6b4f6cefd946b234a8007c745c76a373694b3..f6d3baf1da22a474ccc9be80781091405362d7db 100644 +index 12b2776dd0caa37214a025ea360a8e60e1783653..51f9e899b56342008a21449e92199da2d4b9389d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2255,24 +2255,32 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/1023-Improve-entity-effect-API.patch b/patches/server/1023-Improve-entity-effect-API.patch index 1367d57d33..99eac03a09 100644 --- a/patches/server/1023-Improve-entity-effect-API.patch +++ b/patches/server/1023-Improve-entity-effect-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Improve entity effect API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index d1d9916db7bd4886d30355e6a0ecb69cd21c2364..ddabaed899c755925ad8618b78c33dacaf2126ac 100644 +index 53ee324f353e65e1b504efeb1d0a3876b0e63991..8059c105195bd31f3f3ee680d4a34d6feedcbc04 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1295,4 +1295,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1291,4 +1291,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return this.getHandle().getScoreboardName(); } // Paper end - entity scoreboard name diff --git a/patches/server/1027-Void-damage-configuration-API.patch b/patches/server/1027-Void-damage-configuration-API.patch index 397fec6d91..d25f3c11b4 100644 --- a/patches/server/1027-Void-damage-configuration-API.patch +++ b/patches/server/1027-Void-damage-configuration-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Void damage configuration API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1167e3a378bf2f83848e3a732d407d6e5e689743..723904c751257ea84ee2d16576dfb0d9f2cd4816 100644 +index 89e898e14c0a6388bbd76a2f74828cf6cd46e7a9..4304beeca3c0cd7ef224f9ed74ec49066f1e22a0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -858,8 +858,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -20,7 +20,7 @@ index 1167e3a378bf2f83848e3a732d407d6e5e689743..723904c751257ea84ee2d16576dfb0d9 && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) { // Paper end - Configurable nether ceiling damage diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 64047566eb3049918bb2721679835cfa574c9f13..02b412dcad5c8df6e14e92166b3bea629d640680 100644 +index 75afe539b1dcb8cdccc0cad3c2b8974872e21a63..4277d59f466e800e93770cecb45ab9c76c16aab8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2712,7 +2712,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/1030-Add-proper-async-player-disconnections.patch b/patches/server/1030-Add-proper-async-player-disconnections.patch index c4b7ef0d40..5588f4bf5f 100644 --- a/patches/server/1030-Add-proper-async-player-disconnections.patch +++ b/patches/server/1030-Add-proper-async-player-disconnections.patch @@ -74,7 +74,7 @@ index fc242acade3ff06c9213428cde103cf078216382..b0bc66dc7248aae691dcab68b925b52a return this.server.isSingleplayerOwner(this.playerProfile()); } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f6d3baf1da22a474ccc9be80781091405362d7db..f0200e2e68e3ec88b82d337a76e22a6e80419b6f 100644 +index 51f9e899b56342008a21449e92199da2d4b9389d..5dc2d70fc024ebea971ba536e8493a4ee56c4957 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -767,7 +767,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/1031-DataComponent-API.patch b/patches/server/1031-DataComponent-API.patch index abee23ad89..dbc49d767a 100644 --- a/patches/server/1031-DataComponent-API.patch +++ b/patches/server/1031-DataComponent-API.patch @@ -348,10 +348,10 @@ index 0000000000000000000000000000000000000000..e2fcf870b2256e3df90372c3208f3ed2 +} diff --git a/src/main/java/io/papermc/paper/datacomponent/item/ItemComponentTypesBridgesImpl.java b/src/main/java/io/papermc/paper/datacomponent/item/ItemComponentTypesBridgesImpl.java new file mode 100644 -index 0000000000000000000000000000000000000000..9111c3095986bea43d5eb06763cbe287f6853434 +index 0000000000000000000000000000000000000000..e015b9c1fc5414afe0e040438fd95ef082c69a30 --- /dev/null +++ b/src/main/java/io/papermc/paper/datacomponent/item/ItemComponentTypesBridgesImpl.java -@@ -0,0 +1,239 @@ +@@ -0,0 +1,240 @@ +package io.papermc.paper.datacomponent.item; + +import com.destroystokyo.paper.profile.PlayerProfile; @@ -578,7 +578,8 @@ index 0000000000000000000000000000000000000000..9111c3095986bea43d5eb06763cbe287 + + @Override + public CustomModelData customModelData(final int id) { -+ return new PaperCustomModelData(new net.minecraft.world.item.component.CustomModelData(id)); ++ throw new UnsupportedOperationException("Not implemented yet"); ++ //return new PaperCustomModelData(new net.minecraft.world.item.component.CustomModelData(id)); + } + + @Override @@ -1168,10 +1169,10 @@ index 0000000000000000000000000000000000000000..422e1a4d606481f0dc68843fbbc8126c +} diff --git a/src/main/java/io/papermc/paper/datacomponent/item/PaperEquippable.java b/src/main/java/io/papermc/paper/datacomponent/item/PaperEquippable.java new file mode 100644 -index 0000000000000000000000000000000000000000..ab7947bddfad12d8ae7abcda34f17c3335082a01 +index 0000000000000000000000000000000000000000..cb4dd5b88da769f00060ad24ff4ccd8e0a40a1a6 --- /dev/null +++ b/src/main/java/io/papermc/paper/datacomponent/item/PaperEquippable.java -@@ -0,0 +1,168 @@ +@@ -0,0 +1,170 @@ +package io.papermc.paper.datacomponent.item; + +import io.papermc.paper.adventure.PaperAdventure; @@ -1213,10 +1214,12 @@ index 0000000000000000000000000000000000000000..ab7947bddfad12d8ae7abcda34f17c33 + } + + @Override -+ public @Nullable Key model() { -+ return this.impl.model() -+ .map(PaperAdventure::asAdventure) -+ .orElse(null); ++ public @Nullable Key assetId() { ++ // TODO ++ throw new UnsupportedOperationException("Not yet implemented"); ++ //return this.impl.assetId() ++ // .map(PaperAdventure::asAdventure) ++ // .orElse(null); + } + + @Override @@ -1252,7 +1255,7 @@ index 0000000000000000000000000000000000000000..ab7947bddfad12d8ae7abcda34f17c33 + public Builder toBuilder() { + return new BuilderImpl(this.slot()) + .equipSound(this.equipSound()) -+ .model(this.model()) ++ .assetId(this.assetId()) + .cameraOverlay(this.cameraOverlay()) + .allowedEntities(this.allowedEntities()) + .dispensable(this.dispensable()) @@ -1265,7 +1268,7 @@ index 0000000000000000000000000000000000000000..ab7947bddfad12d8ae7abcda34f17c33 + + private final net.minecraft.world.entity.EquipmentSlot equipmentSlot; + private Holder equipSound = SoundEvents.ARMOR_EQUIP_GENERIC; -+ private Optional model = Optional.empty(); ++ private Optional assetId = Optional.empty(); + private Optional cameraOverlay = Optional.empty(); + private Optional>> allowedEntities = Optional.empty(); + private boolean dispensable = true; @@ -1283,8 +1286,8 @@ index 0000000000000000000000000000000000000000..ab7947bddfad12d8ae7abcda34f17c33 + } + + @Override -+ public Builder model(final @Nullable Key model) { -+ this.model = Optional.ofNullable(model) ++ public Builder assetId(final @Nullable Key model) { ++ this.assetId = Optional.ofNullable(model) + .map(PaperAdventure::asVanilla); + + return this; @@ -1329,7 +1332,7 @@ index 0000000000000000000000000000000000000000..ab7947bddfad12d8ae7abcda34f17c33 + new net.minecraft.world.item.equipment.Equippable( + this.equipmentSlot, + this.equipSound, -+ this.model, ++ null, // TODO + this.cameraOverlay, + this.allowedEntities, + this.dispensable, diff --git a/patches/server/1034-Rewrite-dataconverter-system.patch b/patches/server/1034-Rewrite-dataconverter-system.patch index af8d2dc5e6..93acdfe1ca 100644 --- a/patches/server/1034-Rewrite-dataconverter-system.patch +++ b/patches/server/1034-Rewrite-dataconverter-system.patch @@ -30596,7 +30596,7 @@ index b54a3741cd3ba615c83c98985cb4b3c4c586ed7a..b148cf247acdd36f856d0495cde4cc5a return nbttagcompound; }); diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 0d5d14a9a817c00704728f65cd87e446a0caa3c3..af19ab1f01946c41c27bf6bf76c9b194f85f2737 100644 +index ffbb1763f245a97da58a7d9eae627e61ce200da4..15892c7769caa15f3d52a1ee2147cf9615aa0e25 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -523,7 +523,7 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/1035-Moonrise-optimisation-patches.patch b/patches/server/1035-Moonrise-optimisation-patches.patch index 651d80cfe0..f61876285b 100644 --- a/patches/server/1035-Moonrise-optimisation-patches.patch +++ b/patches/server/1035-Moonrise-optimisation-patches.patch @@ -27814,10 +27814,10 @@ index b7d29389a357f142237cecd75f8ca91cf1eb6b5b..e4b0dc3121101d54394a0c3a413dabf8 this.generatingStep = generationStep; this.cache = chunks; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 88299abf563a041ade1683b66b43103b0eeeea0d..7f5686571ace6155247e085560fcc8919e67734c 100644 +index c7429a386df96a4b03c4c840ca9bd5b37d58ffc3..12f04abd8a4577f6746629ef4ff7e4536a4243a7 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1420,7 +1420,7 @@ public abstract class PlayerList { +@@ -1419,7 +1419,7 @@ public abstract class PlayerList { public void setViewDistance(int viewDistance) { this.viewDistance = viewDistance; @@ -27826,7 +27826,7 @@ index 88299abf563a041ade1683b66b43103b0eeeea0d..7f5686571ace6155247e085560fcc891 Iterator iterator = this.server.getAllLevels().iterator(); while (iterator.hasNext()) { -@@ -1435,7 +1435,7 @@ public abstract class PlayerList { +@@ -1434,7 +1434,7 @@ public abstract class PlayerList { public void setSimulationDistance(int simulationDistance) { this.simulationDistance = simulationDistance; @@ -28213,7 +28213,7 @@ index 50040c497a819cd1229042ab3cb057d34a32cacc..1f9c436a632e4f110be61cf76fcfc3b7 + // Paper end - block counting } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 723904c751257ea84ee2d16576dfb0d9f2cd4816..717500b8b88f123d6b2d3545d33d5c78a1ef7cc1 100644 +index 4304beeca3c0cd7ef224f9ed74ec49066f1e22a0..e11d8a1d1ae0485be243eb04f40051bbd976f926 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -176,7 +176,7 @@ import org.bukkit.event.player.PlayerTeleportEvent; diff --git a/patches/server/1040-Improved-Watchdog-Support.patch b/patches/server/1040-Improved-Watchdog-Support.patch index 56fc63ce68..b12e1355b1 100644 --- a/patches/server/1040-Improved-Watchdog-Support.patch +++ b/patches/server/1040-Improved-Watchdog-Support.patch @@ -304,7 +304,7 @@ index bf2bae3166df06be240dbbeecce16a24c85897a9..c06863578c5d654706d93e73059d89c1 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 7f5686571ace6155247e085560fcc8919e67734c..532e4c1dac20d7481557bb8c84f81c30994ae4d5 100644 +index 12f04abd8a4577f6746629ef4ff7e4536a4243a7..d8217fa7ef475e23d216fa6ff6d08f598d39293b 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -553,7 +553,7 @@ public abstract class PlayerList { diff --git a/patches/server/1041-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1041-Detail-more-information-in-watchdog-dumps.patch index f667a5bf33..b22988735e 100644 --- a/patches/server/1041-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/1041-Detail-more-information-in-watchdog-dumps.patch @@ -123,7 +123,7 @@ index e4a50b2f6cdc9daf6a018aaf44bb029c5003fa65..abed6e7b92d1472bbbc5bfd60abf4f90 private void tickPassenger(Entity vehicle, Entity passenger, boolean isActive) { // Paper - EAR 2 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 717500b8b88f123d6b2d3545d33d5c78a1ef7cc1..d7f2950223533c3cc2d182612d4c485edf3fba2b 100644 +index e11d8a1d1ae0485be243eb04f40051bbd976f926..62cefff26daecd4626ef1d1ab033dcd003e0b799 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1136,8 +1136,43 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/1046-Incremental-chunk-and-player-saving.patch b/patches/server/1046-Incremental-chunk-and-player-saving.patch index 2755cd14ca..9b5d8793db 100644 --- a/patches/server/1046-Incremental-chunk-and-player-saving.patch +++ b/patches/server/1046-Incremental-chunk-and-player-saving.patch @@ -98,7 +98,7 @@ index 9b61fb06875c8070dba30ee541f85b4eed589681..c7c637fcaf02bf5a0861c9ffaca2b473 private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10; private static final int FLY_STAT_RECORDING_SPEED = 25; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 532e4c1dac20d7481557bb8c84f81c30994ae4d5..8de23b39806734c9a413b6d98dbfff25888c1798 100644 +index d8217fa7ef475e23d216fa6ff6d08f598d39293b..1b8bda718e4fb633e43ea01c40ca4c8e14e35fe4 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -518,6 +518,7 @@ public abstract class PlayerList { @@ -109,7 +109,7 @@ index 532e4c1dac20d7481557bb8c84f81c30994ae4d5..8de23b39806734c9a413b6d98dbfff25 this.playerIo.save(player); ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit -@@ -1152,9 +1153,21 @@ public abstract class PlayerList { +@@ -1151,9 +1152,21 @@ public abstract class PlayerList { } public void saveAll() { diff --git a/patches/server/1049-Lag-compensation-ticks.patch b/patches/server/1049-Lag-compensation-ticks.patch index 917ace263a..e237c00bb5 100644 --- a/patches/server/1049-Lag-compensation-ticks.patch +++ b/patches/server/1049-Lag-compensation-ticks.patch @@ -65,7 +65,7 @@ index 504c996220b278c194c93e001a3b326d549868ec..a96f859a5d0c6ec692d4627a69f3c9ee if (this.hasDelayedDestroy) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 02b412dcad5c8df6e14e92166b3bea629d640680..91735414a81c40861315ea2d4ca6fdce64b2c228 100644 +index 4277d59f466e800e93770cecb45ab9c76c16aab8..26d72c4b58bfd768fd246a33bdd7e00fe058bd8f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -4058,6 +4058,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/1050-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1050-Optimise-collision-checking-in-player-move-packet-ha.patch index dcc4506fa6..4f164ac2af 100644 --- a/patches/server/1050-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/server/1050-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN Feature patch diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f0200e2e68e3ec88b82d337a76e22a6e80419b6f..a3d8d5d735272ae2a67536e4d5bbcdb5d2e4bf8b 100644 +index 5dc2d70fc024ebea971ba536e8493a4ee56c4957..68ab52dfdc5599143ce53c930064ef35cd3e2362 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -579,7 +579,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/1054-Allow-using-old-ender-pearl-behavior.patch b/patches/server/1054-Allow-using-old-ender-pearl-behavior.patch index 98de2de07c..c417ad2b78 100644 --- a/patches/server/1054-Allow-using-old-ender-pearl-behavior.patch +++ b/patches/server/1054-Allow-using-old-ender-pearl-behavior.patch @@ -30,7 +30,7 @@ index a2cd4385fca0cf2ec164d06be2732755506c0249..8aff5b7dd14b835788348b22b1fec4d3 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 8de23b39806734c9a413b6d98dbfff25888c1798..1a956249828156fdc273888de59128c3d1a0b898 100644 +index 1b8bda718e4fb633e43ea01c40ca4c8e14e35fe4..d7e24ac52fc95b9cf5399638bb8d1f1520097163 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -602,7 +602,13 @@ public abstract class PlayerList { diff --git a/patches/server/1056-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/1056-Fix-inconsistencies-in-dispense-events-regarding-sta.patch index 564f0bb367..3783dd5df6 100644 --- a/patches/server/1056-Fix-inconsistencies-in-dispense-events-regarding-sta.patch +++ b/patches/server/1056-Fix-inconsistencies-in-dispense-events-regarding-sta.patch @@ -48,7 +48,7 @@ index dff30954e4c588ee4cc79d3f6dab6fb456934d65..ddb264443f2e38b6348226016f913972 return stack; diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java -index 9246ec011c7d94618c0aa73792d1bef8f447c88c..c81050f58a8c75f7f3b16ab466d8d87edd83ea31 100644 +index 56631b08b58aac5801b55d4efc948c6617e812ff..c9d7ac819ce26f5301df7df56edce59b7ef377e0 100644 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java @@ -106,7 +106,7 @@ public interface DispenseItemBehavior { diff --git a/patches/server/1057-Correct-update-cursor.patch b/patches/server/1057-Correct-update-cursor.patch index 1ae9d46f9c..afaa7818a0 100644 --- a/patches/server/1057-Correct-update-cursor.patch +++ b/patches/server/1057-Correct-update-cursor.patch @@ -10,7 +10,7 @@ now leads to an IOOB. patch uses instead. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a3d8d5d735272ae2a67536e4d5bbcdb5d2e4bf8b..cdee55bece5e64a88051ecc0c43f446b50076ed3 100644 +index 68ab52dfdc5599143ce53c930064ef35cd3e2362..2fbe3d8722eeacc3b27ce38145aeffa610f9daab 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3353,7 +3353,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/1063-Fix-incorrect-invulnerability-damage-reduction.patch b/patches/server/1063-Fix-incorrect-invulnerability-damage-reduction.patch index 2b5598fa46..5126da9b2f 100644 --- a/patches/server/1063-Fix-incorrect-invulnerability-damage-reduction.patch +++ b/patches/server/1063-Fix-incorrect-invulnerability-damage-reduction.patch @@ -27,7 +27,7 @@ Instead, this patch makes use of the DamageModifier API, implementing the last-damage-reduction as a DamageModifier. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 91735414a81c40861315ea2d4ca6fdce64b2c228..cc4cc42adc95fb9357d4cf94d81b6c0c109879c1 100644 +index 26d72c4b58bfd768fd246a33bdd7e00fe058bd8f..885449de288dfc9a907ab76330b0ca0c15410243 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1505,12 +1505,12 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/1064-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch b/patches/server/1064-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch index e4f75e957c..53488562d9 100644 --- a/patches/server/1064-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch +++ b/patches/server/1064-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix NPE when EntityResurrectEvent is uncancelled diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index cc4cc42adc95fb9357d4cf94d81b6c0c109879c1..a542bde48edd91929cb7e3dc62c425507a8118fa 100644 +index 885449de288dfc9a907ab76330b0ca0c15410243..96b4fbe4a4655777ff10b32e3257e2fac2aba12a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1722,6 +1722,12 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/1067-Configurable-Entity-Despawn-Time.patch b/patches/server/1067-Configurable-Entity-Despawn-Time.patch index 85007eaf71..2018b8c0d5 100644 --- a/patches/server/1067-Configurable-Entity-Despawn-Time.patch +++ b/patches/server/1067-Configurable-Entity-Despawn-Time.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Entity Despawn Time diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d7f2950223533c3cc2d182612d4c485edf3fba2b..6e01c521cdc6e7d18643248a352a7ad058dab294 100644 +index 62cefff26daecd4626ef1d1ab033dcd003e0b799..27618d07d718cb2a5783536e11d56f712303487b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -388,6 +388,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess