11From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22From: William Blake Galbreath <blake.galbreath@gmail.com>
33Date: Thu, 24 Jun 2021 21:19:30 -0500
4- Subject: [PATCH] Burp after eating food fills hunger bar completely
4+ Subject: [PATCH] Burp delay, burp after eating food fills hunger bar
5+ completely
56
67
78diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
8- index bbfb5f8f88e972a770d0ce5373c67ffe29ba0319..c726476e37e8eb6f15f8c05280deb3d0e797d109 100644
9+ index bbfb5f8f88e972a770d0ce5373c67ffe29ba0319..0bcb88b9fc4e7289153177bd71d8a72458af1dbe 100644
910--- a/src/main/java/net/minecraft/world/entity/player/Player.java
1011+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
1112@@ -201,6 +201,8 @@ public abstract class Player extends LivingEntity {
1213 // CraftBukkit end
1314
1415 // Purpur start
15- + public int burpCooldown = 0;
16+ + public int burpDelay = 0;
1617+
1718 public abstract void resetLastActionTime();
1819
@@ -22,7 +23,7 @@ index bbfb5f8f88e972a770d0ce5373c67ffe29ba0319..c726476e37e8eb6f15f8c05280deb3d0
2223 @Override
2324 public void tick() {
2425+ // Purpur start
25- + if (this.burpCooldown > 0 && --this.burpCooldown == 0) {
26+ + if (this.burpDelay > 0 && --this.burpDelay == 0) {
2627+ this.level.playSound(null, getX(), getY(), getZ(), SoundEvents.PLAYER_BURP, SoundSource.PLAYERS, 1.0F, this.level.random.nextFloat() * 0.1F + 0.9F);
2728+ }
2829+ // Purpur end
@@ -40,7 +41,7 @@ index bbfb5f8f88e972a770d0ce5373c67ffe29ba0319..c726476e37e8eb6f15f8c05280deb3d0
4041 CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayer) this, stack);
4142 }
4243diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java
43- index 2934b6de1f1fb914a532ee20184df99d1acd8e65..65421cfff05c0493f5fef1bdff03172c9e33f33e 100644
44+ index 2934b6de1f1fb914a532ee20184df99d1acd8e65..4c1e9b6f4a52d7b1506b9016cc4d30e583eeab04 100644
4445--- a/src/main/java/net/minecraft/world/food/FoodData.java
4546+++ b/src/main/java/net/minecraft/world/food/FoodData.java
4647@@ -34,8 +34,10 @@ public class FoodData {
@@ -50,26 +51,28 @@ index 2934b6de1f1fb914a532ee20184df99d1acd8e65..65421cfff05c0493f5fef1bdff03172c
5051+ int oldValue = this.foodLevel; // Purpur
5152 this.foodLevel = Math.min(food + this.foodLevel, 20);
5253 this.saturationLevel = Math.min(this.saturationLevel + (float) food * saturationModifier * 2.0F, (float) this.foodLevel);
53- + if (this.entityhuman.level.purpurConfig.playerBurpWhenFull && this.foodLevel == 20 && oldValue < 20) this.entityhuman.burpCooldown = 10 ; // Purpur
54+ + if (this.entityhuman.level.purpurConfig.playerBurpWhenFull && this.foodLevel == 20 && oldValue < 20) this.entityhuman.burpDelay = this.entityhuman.level.purpurConfig.playerBurpDelay ; // Purpur
5455 }
5556
5657 public void eat(Item item, ItemStack stack) {
5758diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
58- index 12609a41c9d6f23c807e509d059dba3bab295a6c..4a86e1ccb948608ad686ecc23ed78c1953298cf4 100644
59+ index ebf607069030efaa5dc8fe70187533f0aec4918e..4e5f8bc3042d68a10d670e8c42d27bef207a0c14 100644
5960--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
6061+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
61- @@ -389,6 +389,7 @@ public class PurpurWorldConfig {
62+ @@ -389,6 +389,8 @@ public class PurpurWorldConfig {
6263 public boolean playerSleepNearMonsters = false;
6364 public boolean playersSkipNight = true;
6465 public double playerCriticalDamageMultiplier = 1.5D;
66+ + public int playerBurpDelay = 10;
6567+ public boolean playerBurpWhenFull = false;
6668 private void playerSettings() {
6769 if (PurpurConfig.version < 19) {
6870 boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
69- @@ -411,6 +412,7 @@ public class PurpurWorldConfig {
71+ @@ -411,6 +413,8 @@ public class PurpurWorldConfig {
7072 playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);
7173 playersSkipNight = getBoolean("gameplay-mechanics.player.can-skip-night", playersSkipNight);
7274 playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
75+ + playerBurpDelay = getInt("gameplay-mechanics.player.burp-delay", playerBurpDelay);
7376+ playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
7477 }
7578
0 commit comments