Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to Minecraft 1.10

Browse Source
This commit is contained in:
Zach Brown
2016-06-08 22:57:14 -05:00
parent 171a079cd2
commit c442e96eb9
173 changed files with 966 additions and 1138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0137-EntityRegainHealthEvent-isFastRegen-API.patch
View File

@@ -1,4 +1,4 @@
From 34d571332952449b1187a9afe61f565ac0575944 Mon Sep 17 00:00:00 2001
From c9bc52c9b190af4b7ae33ba62addfd65af1bdd88 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 22 Apr 2016 01:43:11 -0500
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,10 +6,10 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
Don't even get me started
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index df4d8d8..129bca8 100644
index 01f779c..d0bce92 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -734,10 +734,16 @@ public abstract class EntityLiving extends Entity {
@@ -741,10 +741,16 @@ public abstract class EntityLiving extends Entity {
}
public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) {
@@ -28,7 +28,7 @@ index df4d8d8..129bca8 100644
if (!event.isCancelled()) {
diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
index df5fbeb..ebadb37 100644
index af4f97e..df31391 100644
--- a/src/main/java/net/minecraft/server/FoodMetaData.java
+++ b/src/main/java/net/minecraft/server/FoodMetaData.java
@@ -65,7 +65,7 @@ public class FoodMetaData {
@@ -41,5 +41,5 @@ index df5fbeb..ebadb37 100644
this.foodTickTimer = 0;
}
--
2.7.4 (Apple Git-66)
2.8.3