Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-15 19:10:09 +01:00
Code Issues Projekte Releases Wiki Aktivität

Fix patch conflicts.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2016-03-12 11:24:40 +11:00 committet von Zach Brown
Ursprung fdf80f055f
Commit b1e5adbd8a
1 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 6736f5d4df51b5ac2086aa3261879a02f96ab78a Mon Sep 17 00:00:00 2001 From f4ccb379ee5457463118ae895531ad4eab1bd9b4 Mon Sep 17 00:00:00 2001
From: lazertester <austin.techhead@gmail.com> From: lazertester <austin.techhead@gmail.com>
Date: Sun, 17 Aug 2014 19:56:17 +1000 Date: Sun, 17 Aug 2014 19:56:17 +1000
Subject: [PATCH] Add Hunger Config Values Subject: [PATCH] Add Hunger Config Values
@ -30,13 +30,13 @@ index 9042a4c..11fdee8 100644
} }
diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
index 7fa3a33..ccd7a46 100644 index 6974045..1a24336 100644
--- a/src/main/java/net/minecraft/server/FoodMetaData.java --- a/src/main/java/net/minecraft/server/FoodMetaData.java
+++ b/src/main/java/net/minecraft/server/FoodMetaData.java +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
@@ -74,7 +74,7 @@ public class FoodMetaData { @@ -73,7 +73,7 @@ public class FoodMetaData {
++this.foodTickTimer;
if (this.foodTickTimer >= 80) { if (this.foodTickTimer >= 80) {
// CraftBukkit - added RegainReason entityhuman.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
entityhuman.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED);
- this.a(4.0F); - this.a(4.0F);
+ this.a(entityhuman.world.spigotConfig.regenExhaustion); // Spigot - Change to use configurable value + this.a(entityhuman.world.spigotConfig.regenExhaustion); // Spigot - Change to use configurable value
this.foodTickTimer = 0; this.foodTickTimer = 0;