Put the decompile fixes into MC Dev Fixes patch

Spigot-API-Patches/Add-BeaconEffectEvent.patch

@@ -92,3 +92,5 @@ index 00000000..6579ae99
 +    }
 +}
 -- 
+2.17.0 (Apple Git-106)
+

Spigot-API-Patches/Add-PlayerLocaleChangeEvent.patch

@@ -61,3 +61,5 @@ index 00000000..29dd763a
 +    }
 +}
 -- 
+2.17.0 (Apple Git-106)
+

Spigot-API-Patches/Add-player-view-distance-API.patch

@@ -30,3 +30,5 @@ index 25e44028..7f215f1a 100644
      public class Spigot extends Entity.Spigot
      {
 -- 
+2.17.0 (Apple Git-106)
+

Spigot-Server-Patches/MC-Dev-fixes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index e8f7b7292..a0ebc1eaa 100644
+index e8f7b729..a0ebc1ea 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -0,0 +0,0 @@ public class PaperCommand extends Command {
@@ -15,7 +15,7 @@ index e8f7b7292..a0ebc1eaa 100644
 +    
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 002da2a19..121a137f3 100644
+index 002da2a1..121a137f 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
@@ -57,7 +57,7 @@ index 002da2a19..121a137f3 100644
                          }
  
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index 65910508f..15c7cc170 100644
+index a661789c..785a1a21 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -0,0 +0,0 @@ public class DefinedStructure {
@@ -111,4 +111,47 @@ index 65910508f..15c7cc170 100644
          }
  
          public Iterator<IBlockData> iterator() {
+diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
+index 3b8f6ec1..bde5714d 100644
+--- a/src/main/java/net/minecraft/server/RegistryID.java
++++ b/src/main/java/net/minecraft/server/RegistryID.java
+@@ -0,0 +0,0 @@ import java.util.Arrays;
+ import java.util.Iterator;
+ import javax.annotation.Nullable;
+ 
+-public class RegistryID<K> implements Registry<K> {
++public class RegistryID<K> implements Registry { // Paper - decompile fix
+ 
+     private static final Object a = null;
+     private K[] b;
+@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry<K> {
+ 
+     public RegistryID(int i) {
+         i = (int) ((float) i / 0.8F);
+-        this.b = (Object[]) (new Object[i]);
++        this.b = (K[]) (new Object[i]); // Paper - decompile fix
+         this.c = new int[i];
+-        this.d = (Object[]) (new Object[i]);
++        this.d = (K[]) (new Object[i]); // Paper - decompile fix
+     }
+ 
+     public int getId(@Nullable K k0) {
+@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry<K> {
+     }
+ 
+     private void d(int i) {
+-        Object[] aobject = this.b;
++        K[] aobject = this.b; // Paper - decompile fix
+         int[] aint = this.c;
+ 
+-        this.b = (Object[]) (new Object[i]);
++        this.b = (K[]) (new Object[i]); // Paper - decompile fix
+         this.c = new int[i];
+-        this.d = (Object[]) (new Object[i]);
++        this.d = (K[]) (new Object[i]); // Paper - decompile fix
+         this.e = 0;
+         this.f = 0;
+ 
 -- 
+2.17.0 (Apple Git-106)
+

Spigot-Server-Patches/Optimize-RegistryID.c.patch

@@ -1,24 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
-Date: Mon, 23 Jul 2018 12:50:18 -0400
+Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()
 
 This is a frequent hotspot for world loading/saving.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index 3b8f6ec1..163da432 100644
+index bde5714d..a01cda9d 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
-@@ -0,0 +0,0 @@ import java.util.Arrays;
- import java.util.Iterator;
- import javax.annotation.Nullable;
- 
--public class RegistryID<K> implements Registry<K> {
-+public class RegistryID<K> implements Registry { // Paper - decompile fix
- 
-     private static final Object a = null;
-     private K[] b;
-@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry<K> {
+@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
      private K[] d;
      private int e;
      private int f;
@@ -26,16 +17,14 @@ index 3b8f6ec1..163da432 100644
  
      public RegistryID(int i) {
          i = (int) ((float) i / 0.8F);
--        this.b = (Object[]) (new Object[i]);
-+        this.b = (K[]) (new Object[i]); // Paper - decompile fix
+         this.b = (K[]) (new Object[i]); // Paper - decompile fix
          this.c = new int[i];
--        this.d = (Object[]) (new Object[i]);
-+        this.d = (K[]) (new Object[i]); // Paper - decompile fix
+         this.d = (K[]) (new Object[i]); // Paper - decompile fix
 +        this.usedIds = new java.util.BitSet(); // Paper
      }
  
      public int getId(@Nullable K k0) {
-@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry<K> {
+@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
      }
  
      private int c() {
@@ -50,33 +39,15 @@ index 3b8f6ec1..163da432 100644
  
          return this.e;
      }
- 
-     private void d(int i) {
--        Object[] aobject = this.b;
-+        K[] aobject = this.b; // Paper - decompile fix
-         int[] aint = this.c;
- 
--        this.b = (Object[]) (new Object[i]);
-+        this.b = (K[]) (new Object[i]); // Paper - decompile fix
-         this.c = new int[i];
--        this.d = (Object[]) (new Object[i]);
-+        this.d = (K[]) (new Object[i]); // Paper - decompile fix
+@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
+         this.d = (K[]) (new Object[i]); // Paper - decompile fix
          this.e = 0;
          this.f = 0;
 +        this.usedIds.clear(); // Paper
  
          for (int j = 0; j < aobject.length; ++j) {
              if (aobject[j] != null) {
-@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry<K> {
-     }
- 
-     public void a(K k0, int i) {
--        int j = Math.max(i, this.f + 1);
-+        int j = this.usedIds.size(); // Paper
-         int k;
- 
-         if ((float) j >= (float) this.b.length * 0.8F) {
-@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry<K> {
+@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
          this.b[k] = k0;
          this.c[k] = i;
          this.d[i] = k0;
@@ -84,7 +55,7 @@ index 3b8f6ec1..163da432 100644
          ++this.f;
          if (i == this.e) {
              ++this.e;
-@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry<K> {
+@@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
          Arrays.fill(this.d, (Object) null);
          this.e = 0;
          this.f = 0;