Update CB/S

This commit is contained in:
Shane Freeder
2018-03-31 10:34:25 +01:00
parent 99efa104db
commit 1872a94c83
12 changed files with 28 additions and 28 deletions

View File

@@ -129,7 +129,7 @@ index 6ac89d1e3..177d8582f 100644
// CraftBukkit end
Item item = itemstack.getItem();
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 3cd37f28d..ab3ab3889 100644
index 9e864864d..91e8c1d75 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 {
@@ -156,7 +156,7 @@ index 0255986fd..e14f614f5 100644
this.die();
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 22e3e05ac..cad3465ed 100644
index d0183457e..812e88e58 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {