2022-09-18 05:24:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
|
|
|
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
|
2024-04-25 21:16:00 +02:00
|
|
|
index 118be62539bb0266c2e89bd68abbc4a975fcd833..07559b9629d4ecb40b511256f400a781e39820e0 100644
|
2022-09-18 05:24:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
|
2024-04-24 23:23:56 +02:00
|
|
|
@@ -408,7 +408,7 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
|
|
|
|
this.usePlayerItem(player, hand, itemstack);
|
|
|
|
FoodProperties foodinfo = (FoodProperties) itemstack.get(DataComponents.FOOD);
|
2022-09-18 05:24:28 +02:00
|
|
|
|
2024-04-24 23:23:56 +02:00
|
|
|
- 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());
|
2022-12-10 14:07:35 +01:00
|
|
|
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
|
2024-04-27 23:35:53 +02:00
|
|
|
index 85e0a68d85fe62df19ad9809b1869a3eee6d5465..bc346a6ab6aaa7de363e058d1065fd147b571a57 100644
|
2022-12-10 14:07:35 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
|
2024-04-24 23:23:56 +02:00
|
|
|
@@ -383,7 +383,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
|
2024-03-09 00:52:00 +01:00
|
|
|
boolean flag = this.getHealth() < this.getMaxHealth();
|
|
|
|
|
|
|
|
if (flag) {
|
2022-12-10 14:07:35 +01:00
|
|
|
- this.heal(2.0F);
|
2024-01-18 15:56:25 +01:00
|
|
|
+ this.heal(2.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // Paper - Add missing regain reason
|
2022-12-10 14:07:35 +01:00
|
|
|
}
|
|
|
|
|
2024-03-09 00:52:00 +01:00
|
|
|
boolean flag1 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
|
2022-09-18 05:24:28 +02:00
|
|
|
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
|
2024-05-29 22:58:57 +02:00
|
|
|
index b6574ffbe3b9fac6ce0f4d398508c9914139f7ec..724c4c8493a4b167911dd526ed8662ab4f9b2b66 100644
|
2022-09-18 05:24:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
2024-05-29 20:17:56 +02:00
|
|
|
@@ -189,7 +189,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
|
2022-09-18 05:24:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
|
|
|
|
- this.heal(f);
|
2024-01-18 15:56:25 +01:00
|
|
|
+ this.heal(f, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // Paper - Add missing regain reason
|
2022-09-18 05:24:28 +02:00
|
|
|
flag = true;
|
|
|
|
}
|
|
|
|
|