aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0271-force-entity-dismount-during-teleportation.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-05-21 13:24:56 -0700
committerJake Potrebic <[email protected]>2024-06-12 15:23:00 -0700
commit3693757283d1ad5264d9114faf999866d60f86d7 (patch)
tree3b902f575ea53e7e1f0894333899863d8006214b /patches/server/0271-force-entity-dismount-during-teleportation.patch
parent906df69f05d0779906377abb809bfec9fc3c3546 (diff)
downloadPaper-3693757283d1ad5264d9114faf999866d60f86d7.tar.gz
Paper-3693757283d1ad5264d9114faf999866d60f86d7.zip
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: def44cbf SPIGOT-7669: Fix typo in ProjectileHitEvent#getHitBlockFace documentation 53fa4f72 PR-1011: Throw an exception if a RecipeChoice is ever supplied air CraftBukkit Changes: 87d0a3368 SPIGOT-7668: Move NONE Registry updater to FieldRename to avoid some class loader issues 2ea1e7ac2 PR-1399: Fix regression preventing positive .setDamage value from causing knockback for 0 damage events ba2d49d21 Increase outdated build delay Spigot Changes: 342f4939 SPIGOT-7661: Add experimental unload-frozen-chunks option
Diffstat (limited to 'patches/server/0271-force-entity-dismount-during-teleportation.patch')
-rw-r--r--patches/server/0271-force-entity-dismount-during-teleportation.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0271-force-entity-dismount-during-teleportation.patch b/patches/server/0271-force-entity-dismount-during-teleportation.patch
index 15629559e6..046d16ac21 100644
--- a/patches/server/0271-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0271-force-entity-dismount-during-teleportation.patch
@@ -106,10 +106,10 @@ index 1f28f466aab3d829fe719878faee40f35320163b..ea8abc813809360b51cd67072d12efa0
if (this.valid) {
Bukkit.getPluginManager().callEvent(event);
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4f63352f9f96b104e3a01929d96ee33dcd01ab7d..cc5cafa8388d96e18494d3c89f36d1654ea44f7d 100644
+index 7217cf55beb26823ca9c2eb97dc0af4ff456da08..7a9e6671ac38a3473d5562b0eb1de9eecc95c6c5 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3575,9 +3575,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3569,9 +3569,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Override
public void stopRiding() {