From 2cd962b21d2017d73d53cfbdf8e07d416a924e07 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn 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 d03ac0e70..9242999f7 100644 --- a/src/main/java/net/minecraft/server/RegistryID.java +++ b/src/main/java/net/minecraft/server/RegistryID.java @@ -13,12 +13,14 @@ public class RegistryID implements Registry { 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]); this.c = new int[i]; this.d = (K[])(new Object[i]); + this.usedIds = new java.util.BitSet(); // Paper } public int getId(@Nullable K object) { @@ -41,9 +43,14 @@ public class RegistryID implements Registry { } 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; } @@ -56,6 +63,7 @@ public class RegistryID implements Registry { this.d = (K[])(new Object[i]); this.e = 0; this.f = 0; + this.usedIds.clear(); // Paper for(int j = 0; j < aobject.length; ++j) { if (aobject[j] != null) { @@ -80,6 +88,7 @@ public class RegistryID implements Registry { this.b[l] = object; this.c[l] = i; this.d[i] = object; + this.usedIds.set(i); // Paper ++this.f; if (i == this.e) { ++this.e; @@ -140,6 +149,7 @@ public class RegistryID implements Registry { Arrays.fill(this.d, (Object)null); this.e = 0; this.f = 0; + this.usedIds.clear(); // Paper } public int b() { -- 2.20.0