Rebuild patches for upstream merge

This commit is contained in:
Aikar
2018-07-21 16:43:00 -04:00
parent 7c13469d6c
commit 1b778924c3
17 changed files with 52 additions and 59 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 51b42933d..eb2a693af 100644
index 34c617958..c7ef67a52 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