diff options
| author | Newwind <[email protected]> | 2024-08-31 19:29:50 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-08-31 20:29:50 +0200 |
| commit | 509ea2fd17fa03ce04f86046098607733b8767ba (patch) | |
| tree | 3f7c9a29481fafbb6ad9f846839ec8f4863d2363 /patches/server/0738-Missing-eating-regain-reason.patch | |
| parent | e01ddf46279fbb68d157749a906b7a2ecc60da1a (diff) | |
| download | Paper-509ea2fd17fa03ce04f86046098607733b8767ba.tar.gz Paper-509ea2fd17fa03ce04f86046098607733b8767ba.zip | |
Fix horse armor desync (#11341)
Diffstat (limited to 'patches/server/0738-Missing-eating-regain-reason.patch')
| -rw-r--r-- | patches/server/0738-Missing-eating-regain-reason.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/patches/server/0738-Missing-eating-regain-reason.patch b/patches/server/0738-Missing-eating-regain-reason.patch new file mode 100644 index 0000000000..af804e161b --- /dev/null +++ b/patches/server/0738-Missing-eating-regain-reason.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lulu13022002 <[email protected]> +Date: Fri, 5 Aug 2022 12:16:51 +0200 +Subject: [PATCH] Missing eating regain reason + + +diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java +index 2ed442c8d36f285420cf84a956e90b6036384ce0..23d4dcc82115fd1a0a77565a0472304042d5f12d 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java ++++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java +@@ -398,7 +398,7 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian + this.usePlayerItem(player, hand, itemstack); + FoodProperties foodinfo = (FoodProperties) itemstack.get(DataComponents.FOOD); + +- this.heal(foodinfo != null ? (float) foodinfo.nutrition() : 1.0F); ++ this.heal(foodinfo != null ? (float) foodinfo.nutrition() : 1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // Paper - Add missing regain reason + } + + return InteractionResult.sidedSuccess(this.level().isClientSide()); +diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +index 12d3ef81247f3088490f9b87d8068c2e2c6338c7..aecd17953dc117d369885d4c8d7b5c7c3a0f8f0f 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java ++++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +@@ -387,7 +387,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl + boolean flag = this.getHealth() < this.getMaxHealth(); + + if (flag) { +- this.heal(2.0F); ++ this.heal(2.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // Paper - Add missing regain reason + } + + boolean flag1 = this.isTamed() && this.getAge() == 0 && this.canFallInLove(); +diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java +index 33b7e578f39608d522a9c270cac69be44a34456b..82c57124433cc033c99e609e8ad71e03d340bc5e 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java ++++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java +@@ -184,7 +184,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V + } + + if (this.getHealth() < this.getMaxHealth() && f > 0.0F) { +- this.heal(f); ++ this.heal(f, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // Paper - Add missing regain reason + flag = true; + } + |