Merge 5e5ef7bd84 into 8f7ac62905

2024-04-29 09:38:50 -04:00 · 2024-04-29 09:38:50 -04:00 · d4da852eab
parent 8f7ac62905 5e5ef7bd84
commit d4da852eab
2 changed files with 200 additions and 0 deletions
--- a/patches/api/0351-FoodLevelChangeEvent-Expose-Saturation.patch
+++ b/patches/api/0351-FoodLevelChangeEvent-Expose-Saturation.patch
@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
+Date: Sat, 25 Dec 2021 23:04:06 -0500
+Subject: [PATCH] FoodLevelChangeEvent Expose Saturation
+
+
+diff --git a/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java b/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java
+index 7f4c5ea8607b08f8676528cc71b0b312575809ed..963396f5f70a1b896faae00c6d6b565f9f25ab68 100644
+--- a/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java
+++ b/src/main/java/org/bukkit/event/entity/FoodLevelChangeEvent.java
+@@ -15,16 +15,27 @@ public class FoodLevelChangeEvent extends EntityEvent implements Cancellable {
+     private boolean cancel = false;
+     private int level;
+     private final ItemStack item;
+    private float saturationLevel; // Paper - Expose Saturation
+ 
+     public FoodLevelChangeEvent(@NotNull final HumanEntity what, final int level) {
+         this(what, level, null);
+     }
+ 
+    @Deprecated // Paper - Expose Saturation
+     public FoodLevelChangeEvent(@NotNull final HumanEntity what, final int level, @Nullable final ItemStack item) {
+         super(what);
+         this.level = level;
+         this.item = item;
+        this.saturationLevel = what.getSaturation(); // Just incase, make sure the player's saturation doesn't change. // Paper - Expose Saturation
+     }
+    // Paper Start - Expose Saturation
+    public FoodLevelChangeEvent(@NotNull final HumanEntity what, final int level, @Nullable final ItemStack item, final float saturationLevel) {
+        super(what);
+        this.level = level;
+        this.item = item;
+        this.saturationLevel = saturationLevel;
+    }
+    // Paper End - Expose Saturation
+ 
+     @NotNull
+     @Override
+@@ -67,6 +78,28 @@ public class FoodLevelChangeEvent extends EntityEvent implements Cancellable {
+         this.level = level;
+     }
+ 
+    // Paper Start - Expose Saturation
+    /**
+     * Gets the saturation that the entity
+     * involved in this event would be set to.
+     *
+     * @return saturation level
+     */
+    public float getSaturationLevel() {
+        return saturationLevel;
+    }
+
+    /**
+     * Sets the saturation that the entity
+     * involved in this event will be set to.
+     *
+     * @param saturationLevel new saturation level
+     */
+    public void setSaturationLevel(float saturationLevel) {
+        this.saturationLevel = saturationLevel;
+    }
+    // Paper End - Expose Saturation
+
+     @Override
+     public boolean isCancelled() {
+         return cancel;
--- a/patches/server/0839-FoodLevelChangeEvent-Expose-Saturation-Level.patch
+++ b/patches/server/0839-FoodLevelChangeEvent-Expose-Saturation-Level.patch
@ -0,0 +1,133 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
+Date: Sat, 25 Dec 2021 23:04:14 -0500
+Subject: [PATCH] FoodLevelChangeEvent Expose Saturation Level
+
+
+diff --git a/src/main/java/net/minecraft/world/effect/MobEffect.java b/src/main/java/net/minecraft/world/effect/MobEffect.java
+index 8bbb9bdcf95989f1737714655f6f6a269d46d7f2..3935cc5c35c2bc3a86fcbcac247cbe52547d3cf3 100644
+--- a/src/main/java/net/minecraft/world/effect/MobEffect.java
+++ b/src/main/java/net/minecraft/world/effect/MobEffect.java
+@@ -63,13 +63,7 @@ public class MobEffect {
+             if (!entity.level.isClientSide) {
+                 // CraftBukkit start
+                 Player entityhuman = (Player) entity;
+-                int oldFoodLevel = entityhuman.getFoodData().foodLevel;
+-
+-                org.bukkit.event.entity.FoodLevelChangeEvent event = CraftEventFactory.callFoodLevelChangeEvent(entityhuman, amplifier + 1 + oldFoodLevel);
+-
+-                if (!event.isCancelled()) {
+-                    entityhuman.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, 1.0F);
+-                }
+                CraftEventFactory.handleFoodChange(entityhuman, 1, 1.0F, null); // Paper - Expose Saturation
+ 
+                 ((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel));
+                 // CraftBukkit end
+diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java
+index 2934b6de1f1fb914a532ee20184df99d1acd8e65..d1b843b5d5281010bb180470d494da4afff86576 100644
+--- a/src/main/java/net/minecraft/world/food/FoodData.java
+++ b/src/main/java/net/minecraft/world/food/FoodData.java
+@@ -42,13 +42,7 @@ public class FoodData {
+         if (item.isEdible()) {
+             FoodProperties foodinfo = item.getFoodProperties();
+             // CraftBukkit start
+-            int oldFoodLevel = this.foodLevel;
+-
+-            org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityhuman, foodinfo.getNutrition() + oldFoodLevel, stack);
+-
+-            if (!event.isCancelled()) {
+-                this.eat(event.getFoodLevel() - oldFoodLevel, foodinfo.getSaturationModifier());
+-            }
+            org.bukkit.craftbukkit.event.CraftEventFactory.handleFoodChange(entityhuman, foodinfo.getNutrition(), foodinfo.getSaturationModifier(), stack); // Paper - Expose Saturation
+ 
+             ((ServerPlayer) this.entityhuman).getBukkitEntity().sendHealthUpdate();
+             // CraftBukkit end
+@@ -63,13 +57,28 @@ public class FoodData {
+         if (this.exhaustionLevel > 4.0F) {
+             this.exhaustionLevel -= 4.0F;
+             if (this.saturationLevel > 0.0F) {
+                float lastSaturationLevel = this.saturationLevel; // Paper - Expose Saturation
+                 this.saturationLevel = Math.max(this.saturationLevel - 1.0F, 0.0F);
+                // Paper start - Expose Saturation
+                org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, this.foodLevel, this.saturationLevel);
+
+                // Only saturation is modified in this call
+                if (event.isCancelled()) {
+                    this.saturationLevel = lastSaturationLevel;
+                } else {
+                    this.foodLevel = event.getFoodLevel();
+                    this.saturationLevel = event.getSaturationLevel();
+                }
+
+                ((ServerPlayer) player).getBukkitEntity().sendHealthUpdate();
+                // Paper end - Expose Saturation
+             } else if (enumdifficulty != Difficulty.PEACEFUL) {
+                 // CraftBukkit start
+-                org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, Math.max(this.foodLevel - 1, 0));
+                org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, Math.max(this.foodLevel - 1, 0), this.saturationLevel); // Paper - Expose Saturation
+ 
+                 if (!event.isCancelled()) {
+                     this.foodLevel = event.getFoodLevel();
+                    this.saturationLevel = event.getSaturationLevel(); // Paper - Expose Saturation
+                 }
+ 
+                 ((ServerPlayer) player).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) player).getBukkitEntity().getScaledHealth(), this.foodLevel, this.saturationLevel));
+diff --git a/src/main/java/net/minecraft/world/level/block/CakeBlock.java b/src/main/java/net/minecraft/world/level/block/CakeBlock.java
+index 1a87a1553bb94e33c86b9d8947cf39fd193e7859..0d5ac99e78f4b41d48f828bf95e87db3e88b8948 100644
+--- a/src/main/java/net/minecraft/world/level/block/CakeBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/CakeBlock.java
+@@ -87,13 +87,7 @@ public class CakeBlock extends Block {
+             player.awardStat(Stats.EAT_CAKE_SLICE);
+             // CraftBukkit start
+             // entityhuman.getFoodData().eat(2, 0.1F);
+-            int oldFoodLevel = player.getFoodData().foodLevel;
+-
+-            org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, 2 + oldFoodLevel);
+-
+-            if (!event.isCancelled()) {
+-                player.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, 0.1F);
+-            }
+            org.bukkit.craftbukkit.event.CraftEventFactory.handleFoodChange(player, 2, 0.1F, null); // Paper - Expose Saturation
+ 
+             ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity().sendHealthUpdate();
+             // CraftBukkit end
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index c667baa2da8222eb66344c8f1cc0fed416c4df01..6ba1916421ab9cfc042dd4fa0c1df90c8c9cc55b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1235,12 +1235,31 @@ public class CraftEventFactory {
+         return event;
+     }
+ 
+-    public static FoodLevelChangeEvent callFoodLevelChangeEvent(net.minecraft.world.entity.player.Player entity, int level) {
+-        return CraftEventFactory.callFoodLevelChangeEvent(entity, level, null);
+    // Paper start - Expose Saturation
+    public static void handleFoodChange(net.minecraft.world.entity.player.Player player, int level, float saturationModifier, @Nullable ItemStack item) {
+        var foodData = player.getFoodData();
+
+        float oldSaturationLevel = foodData.saturationLevel;
+        int oldFoodLevel = foodData.foodLevel;
+        foodData.eat(level, saturationModifier);
+
+        org.bukkit.event.entity.FoodLevelChangeEvent event = CraftEventFactory.callFoodLevelChangeEvent(player, foodData.foodLevel, foodData.saturationLevel, item);
+        if (!event.isCancelled()) {
+            foodData.saturationLevel = event.getSaturationLevel();
+            foodData.foodLevel = event.getFoodLevel();
+        } else {
+            foodData.saturationLevel = oldSaturationLevel;
+            foodData.foodLevel = oldFoodLevel;
+        }
+    }
+
+    public static FoodLevelChangeEvent callFoodLevelChangeEvent(net.minecraft.world.entity.player.Player entity, int level, float saturationLevel) {
+        return CraftEventFactory.callFoodLevelChangeEvent(entity, level, saturationLevel, null);
+     }
+ 
+-    public static FoodLevelChangeEvent callFoodLevelChangeEvent(net.minecraft.world.entity.player.Player entity, int level, ItemStack item) {
+-        FoodLevelChangeEvent event = new FoodLevelChangeEvent(entity.getBukkitEntity(), level, (item == null) ? null : CraftItemStack.asBukkitCopy(item));
+    public static FoodLevelChangeEvent callFoodLevelChangeEvent(net.minecraft.world.entity.player.Player entity, int level, float saturationLevel, ItemStack item) {
+        FoodLevelChangeEvent event = new FoodLevelChangeEvent(entity.getBukkitEntity(), level, (item == null) ? null : CraftItemStack.asBukkitCopy(item), saturationLevel);
+        // Paper end - Expose Saturation
+         entity.getBukkitEntity().getServer().getPluginManager().callEvent(event);
+         return event;
+     }