Update upstream B/CB

This commit is contained in:
Zach Brown
2018-07-30 20:19:41 -05:00
parent be0ed31821
commit 452f012665
28 changed files with 98 additions and 98 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't let fishinghooks use portals
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e56f458ca9..167cbb2820 100644
index 964caa080..c28723158 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index e56f458ca9..167cbb2820 100644
public int dimension;
protected BlockPosition aq;
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index 7c119282b9..4f801e8fec 100644
index 7c119282b..4f801e8fe 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {