Re-add block inlining - Closes #1229

Also reordered MC Utils to be higher up
2018-07-22 18:46:13 -04:00
parent d5a4135e98
commit 1fbc4f4d9b
7 changed files with 213 additions and 16 deletions
--- a/Spigot-Server-Patches/Paper-Metrics.patch
+++ b/Spigot-Server-Patches/Paper-Metrics.patch
@@ -671,7 +671,7 @@ index 3d8ee9ed3..5ab2cf6ee 100644
 
     static void readConfig(Class<?> clazz, Object instance) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index ac36ea08e..09100408e 100644
+index 5175e9523..676780b61 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +0,0 @@ public class SpigotConfig