mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-28 02:59:12 +00:00
53 lines
2.4 KiB
Diff
53 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Fri, 23 Dec 2022 15:40:22 +0100
|
|
Subject: [PATCH] Fix MC-31819
|
|
|
|
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|
Gale - https://galemc.org
|
|
|
|
This patch is based on the following patch:
|
|
"Fix hunger saturation depleting on peaceful"
|
|
By: etil2jz <81570777+etil2jz@users.noreply.github.com>
|
|
As part of: Mirai (https://github.com/etil2jz/Mirai)
|
|
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|
|
|
* Mirai description *
|
|
|
|
The food saturation value is depleted on peaceful, even though
|
|
the displayed hunger bar never goes down. Hunger (or any related value, including saturation)
|
|
should not go down on peaceful. See https://bugs.mojang.com/browse/MC-31819.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
index 2e6557a19523d18aecff709de30cb4466b46a9fa..bb838cad051ab8da85e2f5bcf689b6d280e91fcb 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
@@ -1900,6 +1900,11 @@ public abstract class Player extends LivingEntity {
|
|
}
|
|
|
|
public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {
|
|
+ // Gale start - Mirai - fix MC-31819
|
|
+ if (this.level.galeConfig().gameplayMechanics.fixes.mc31819 && this.level.getDifficulty() == Difficulty.PEACEFUL) {
|
|
+ return;
|
|
+ }
|
|
+ // Gale end - Mirai - fix MC-31819
|
|
// CraftBukkit end
|
|
if (!this.abilities.invulnerable) {
|
|
if (!this.level.isClientSide) {
|
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
index c1349f89da677297ca1c24e375addaed1f91953c..a7228108ffb447b27f254737a81709d0de2222f6 100644
|
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
@@ -270,6 +270,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
|
public boolean mc110386 = true;
|
|
// Gale end - Mirai - fix MC-110386
|
|
|
|
+ // Gale start - Mirai - fix MC-31819
|
|
+ @Setting("mc-31819")
|
|
+ public boolean mc31819 = true;
|
|
+ // Gale end - Mirai - fix MC-31819
|
|
+
|
|
}
|
|
|
|
}
|