Merge pull request #1257

0069113b Put the decompile fixes into MC Dev Fixes patch (Andrew Steinborn)
608b5e52 Optimize RegistryID.c() (Andrew Steinborn)

* pull/1257/head:
  Put the decompile fixes into MC Dev Fixes patch
  Optimize RegistryID.c()

Spigot-API-Patches/0008-Add-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From 501e01d868ec3f41f8aa3a1bebc83b4305723b42 Mon Sep 17 00:00:00 2001
+From 2ee52b020013ad95861d196908450fa2fc227431 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Mon, 29 Feb 2016 18:02:25 -0600
 Subject: [PATCH] Add PlayerLocaleChangeEvent
@@ -61,5 +61,5 @@ index 00000000..29dd763a
 +    }
 +}
 -- 
-2.18.0
+2.17.0 (Apple Git-106)
 

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

@@ -1,4 +1,4 @@
-From a046e06ee22190a42f8ec203d7b106a9271c09f2 Mon Sep 17 00:00:00 2001
+From 3308624206985251b7646042a4276f026c169c0b Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API
@@ -30,5 +30,5 @@ index 25e44028..7f215f1a 100644
      public class Spigot extends Entity.Spigot
      {
 -- 
-2.18.0
+2.17.0 (Apple Git-106)
 

Spigot-API-Patches/0010-Add-BeaconEffectEvent.patch

@@ -1,4 +1,4 @@
-From e9e1ec6471574850b8eb0cd61bb019a05d7adbb2 Mon Sep 17 00:00:00 2001
+From b0d2313841c2f617773d33708aaca8fece34d75c Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:09:40 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@@ -92,5 +92,5 @@ index 00000000..6579ae99
 +    }
 +}
 -- 
-2.18.0
+2.17.0 (Apple Git-106)
 

Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From d9b9cd6fb36cdf689bbe3760147795092a6b111f Mon Sep 17 00:00:00 2001
+From fa4c0456f5dd7abf1913952d44e859ebfdd61069 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -498,5 +498,5 @@ index f4d1ade5..65b7a076 100644
  
      /**
 -- 
-2.18.0
+2.17.0 (Apple Git-106)
 

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

@@ -1,11 +1,11 @@
-From 1b41bf7f810b3bd6c90db0a7c4ee15776bc6f832 Mon Sep 17 00:00:00 2001
+From fa5eced3c89ff7fa1b290628a381d1211606e2bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 19:36:20 -0400
 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
 @@ -234,4 +234,5 @@ 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
 @@ -150,7 +150,7 @@ 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
 @@ -88,7 +88,7 @@ public class DefinedStructure {
@@ -111,6 +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
-2.17.1
+index 3b8f6ec1..bde5714d 100644
+--- a/src/main/java/net/minecraft/server/RegistryID.java
++++ b/src/main/java/net/minecraft/server/RegistryID.java
+@@ -6,7 +6,7 @@ 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;
+@@ -17,9 +17,9 @@ 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) {
+@@ -51,12 +51,12 @@ 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/0307-Optimize-RegistryID.c.patch

@@ -0,0 +1,68 @@
+From 48a1b1c1f5b4572ab2ade1314c35c9508d3644ea Mon Sep 17 00:00:00 2001
+From: Andrew Steinborn <git@steinborn.me>
+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 bde5714d..a01cda9d 100644
+--- a/src/main/java/net/minecraft/server/RegistryID.java
++++ b/src/main/java/net/minecraft/server/RegistryID.java
+@@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
+     private K[] d;
+     private int e;
+     private int f;
++    private java.util.BitSet usedIds; // Paper
+ 
+     public RegistryID(int i) {
+         i = (int) ((float) i / 0.8F);
+         this.b = (K[]) (new Object[i]); // Paper - decompile fix
+         this.c = new int[i];
+         this.d = (K[]) (new Object[i]); // Paper - decompile fix
++        this.usedIds = new java.util.BitSet(); // Paper
+     }
+ 
+     public int getId(@Nullable K k0) {
+@@ -43,9 +45,14 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
+     }
+ 
+     private int c() {
++        // Paper start
++        /*
+         while (this.e < this.d.length && this.d[this.e] != null) {
+             ++this.e;
+         }
++        */
++        this.e = this.usedIds.nextClearBit(0);
++        // Paper end
+ 
+         return this.e;
+     }
+@@ -59,6 +66,7 @@ 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) {
+@@ -84,6 +92,7 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
+         this.b[k] = k0;
+         this.c[k] = i;
+         this.d[i] = k0;
++        this.usedIds.set(i); // Paper
+         ++this.f;
+         if (i == this.e) {
+             ++this.e;
+@@ -148,6 +157,7 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
+         Arrays.fill(this.d, (Object) null);
+         this.e = 0;
+         this.f = 0;
++        this.usedIds.clear(); // Paper
+     }
+ 
+     public int b() {
+-- 
+2.17.0 (Apple Git-106)
+