Re-add block inlining - Closes #1229

Also reordered MC Utils to be higher up
This commit is contained in:
Aikar
2018-07-22 18:46:13 -04:00
parent d5a4135e98
commit 1fbc4f4d9b
7 changed files with 213 additions and 16 deletions

View File

@@ -26,7 +26,7 @@ index a0ebc1eaa..e4c771a39 100644
+
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 515c9d875..53fc37088 100644
index 3fa32228b..e65558f7a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityPortalEvent;
@@ -88,7 +88,7 @@ index 515c9d875..53fc37088 100644
protected abstract void a(NBTTagCompound nbttagcompound);
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 557a3f97f..97cfd6695 100644
index 9a513b4e3..fa268f354 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -0,0 +0,0 @@ public class EntityTypes<T extends Entity> {
@@ -114,7 +114,7 @@ index 000000000..61c2b993c
+ }
+}
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 093e7eb7f..b09325097 100644
index 8a0453245..257dd1da9 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;