Update upstream B/CB

This commit is contained in:
Zach Brown
2017-06-25 18:00:32 -05:00
parent 7409728bf3
commit 3f5b488720
13 changed files with 48 additions and 48 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Do not let armorstands drown
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 036498c0..f25ee906 100644
index 036498c09..f25ee9061 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 036498c0..f25ee906 100644
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index b18fc969..3c7c4390 100644
index 35e473a26..66b82bbfb 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 {