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-24 23:23:56 +02:00
|
|
|
index 57c22ca91e9f3a161f5277914e379ea9dc8eeeef..827c5800b9e898418ff7a641c97ffb86935a914c 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-24 23:23:56 +02:00
|
|
|
index 09aa76ec6f89163c1221721008ccb541eaf420ca..f3fcfd3b358f496d26748099e1d5a95721a6a0d8 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-04-24 23:23:56 +02:00
|
|
|
index 4fa1a12e7e5c23e1d902b59f2a315eac64134aa8..d4eceb535561e11f5f7ab891e81aac285f3cd828 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-04-24 23:23:56 +02:00
|
|
|
@@ -188,7 +188,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;
|
|
|
|
}
|
|
|
|
|