Update Paper to MC 1.12

This commit is contained in:
Shane Freeder
2017-06-08 15:16:51 +01:00
parent 30cc65c220
commit 8bb457e352
22 changed files with 80 additions and 92 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 1ad33521c..2b20a0205 100644
index 6b9b55020..fe9cd7769 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -34,9 +34,9 @@ index 1ad33521c..2b20a0205 100644
+ }
+ // Paper end
+
this.a(this.cF(), itemstack);
this.a(this.cH(), itemstack);
// CraftBukkit end
this.cL();
this.cN();
+
+ // Paper start - if the replacement is anything but the default, update the client inventory
+ if (this instanceof EntityPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {