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

69 lines
2.1 KiB
Diff
Raw Normal View History

From 765c811360685b754d86b1617a860f682f03b9d0 Mon Sep 17 00:00:00 2001
2018-07-23 18:58:01 +02:00
From: Andrew Steinborn <git@steinborn.me>
Date: Mon, 23 Jul 2018 13:08:19 -0400
2018-07-23 18:58:01 +02:00
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 d03ac0e70c..9242999f70 100644
2018-07-23 18:58:01 +02:00
--- 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<K> implements Registry<K> {
2018-07-23 18:58:01 +02:00
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]);
2018-07-23 18:58:01 +02:00
this.c = new int[i];
this.d = (K[])(new Object[i]);
2018-07-23 18:58:01 +02:00
+ this.usedIds = new java.util.BitSet(); // Paper
}
public int getId(@Nullable K object) {
@@ -41,9 +43,14 @@ public class RegistryID<K> implements Registry<K> {
2018-07-23 18:58:01 +02:00
}
private int c() {
+ // Paper start
+ /*
while(this.e < this.d.length && this.d[this.e] != null) {
2018-07-23 18:58:01 +02:00
++this.e;
}
+ */
+ this.e = this.usedIds.nextClearBit(0);
+ // Paper end
return this.e;
}
@@ -56,6 +63,7 @@ public class RegistryID<K> implements Registry<K> {
this.d = (K[])(new Object[i]);
2018-07-23 18:58:01 +02:00
this.e = 0;
this.f = 0;
+ this.usedIds.clear(); // Paper
for(int j = 0; j < aobject.length; ++j) {
2018-07-23 18:58:01 +02:00
if (aobject[j] != null) {
@@ -80,6 +88,7 @@ public class RegistryID<K> implements Registry<K> {
this.b[l] = object;
this.c[l] = i;
this.d[i] = object;
2018-07-23 18:58:01 +02:00
+ this.usedIds.set(i); // Paper
++this.f;
if (i == this.e) {
++this.e;
@@ -140,6 +149,7 @@ public class RegistryID<K> implements Registry<K> {
Arrays.fill(this.d, (Object)null);
2018-07-23 18:58:01 +02:00
this.e = 0;
this.f = 0;
+ this.usedIds.clear(); // Paper
}
public int b() {
--
2.19.0
2018-07-23 18:58:01 +02:00