Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 17:37:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix patch conflicts.

Browse Source
This commit is contained in:
md_5 2016-03-12 11:24:40 +11:00 committed by Zach Brown
parent fdf80f055f
commit b1e5adbd8a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch
View File

@ -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>
Date: Sun, 17 Aug 2014 19:56:17 +1000
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
index 7fa3a33..ccd7a46 100644
index 6974045..1a24336 100644
--- a/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) {
// CraftBukkit - added RegainReason
entityhuman.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED);
entityhuman.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
- this.a(4.0F);
+ this.a(entityhuman.world.spigotConfig.regenExhaustion); // Spigot - Change to use configurable value
this.foodTickTimer = 0;