1.21.6 dev

Co-authored-by: Bjarne Koll <git@lynxplay.dev>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
This commit is contained in:
Bjarne Koll
2025-05-28 13:23:32 +02:00
committed by Nassim Jahnke
parent 39203a65e0
commit a24f9b204c
788 changed files with 41006 additions and 6324 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/food/FoodData.java
+++ b/net/minecraft/world/food/FoodData.java
@@ -14,6 +_,11 @@
@@ -15,6 +_,11 @@
public float saturationLevel = 5.0F;
public float exhaustionLevel;
private int tickTimer;
@@ -12,7 +12,7 @@
private void add(int foodLevel, float saturationLevel) {
this.foodLevel = Mth.clamp(foodLevel + this.foodLevel, 0, 20);
@@ -28,6 +_,17 @@
@@ -29,6 +_,17 @@
this.add(foodProperties.nutrition(), foodProperties.saturation());
}
@@ -28,9 +28,9 @@
+ // CraftBukkit end
+
public void tick(ServerPlayer player) {
ServerLevel serverLevel = player.serverLevel();
ServerLevel serverLevel = player.level();
Difficulty difficulty = serverLevel.getDifficulty();
@@ -36,29 +_,39 @@
@@ -37,29 +_,39 @@
if (this.saturationLevel > 0.0F) {
this.saturationLevel = Math.max(this.saturationLevel - 1.0F, 0.0F);
} else if (difficulty != Difficulty.PEACEFUL) {