PaperMC/Spigot-Server-Patches/0338-Optimize-RegistryMaterials.patch
Shane Freeder ea855e2b46 Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Developers!: You will need to clean up your work/Minecraft/1.13.2 folder
for this

Also, restore a patch that was dropped in the last upstream

Bukkit Changes:
279eeab3 Fix command description not being set
96e2bb18 Remove debug print from SyntheticEventTest

CraftBukkit Changes:
d3ed1516 Fix dangerously threaded beacons
217a293d Don't relocate joptsimple to allow --help to work.
1be05a21 Prepare for imminent Java 12 release
a49270b2 Mappings Update
5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports

Spigot Changes:
e6eb36f2 Rebuild patches
2019-03-20 01:55:16 +00:00

38 lines
1.6 KiB
Diff

From ab8504873f6002be3e43c0c6b36317a6cfd5474a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 26 Aug 2018 20:49:50 -0400
Subject: [PATCH] Optimize RegistryMaterials
Use larger initial sizes to increase bucket capacity on the BiMap
BiMap.get was seen to be using a good bit of CPU time.
diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java
index 1521ed759..78de740ac 100644
--- a/src/main/java/net/minecraft/server/RegistryMaterials.java
+++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
@@ -15,9 +15,9 @@ import org.apache.logging.log4j.Logger;
public class RegistryMaterials<V> implements IRegistry<V> {
protected static final Logger a = LogManager.getLogger();
- protected final RegistryID<V> b = new RegistryID<>(256);
- protected final BiMap<MinecraftKey, V> c = HashBiMap.create();
- protected Object[] d;
+ protected final RegistryID<V> b = new RegistryID<V>(2048); // Paper - use bigger expected size to reduce collisions
+ protected final BiMap<MinecraftKey, V> c = HashBiMap.create(2048); // Paper - use bigger expected size to reduce collisions
+ protected V[] d; // Paper - Decompile fix
private int x;
public RegistryMaterials() {}
@@ -90,7 +90,7 @@ public class RegistryMaterials<V> implements IRegistry<V> {
return null;
}
- this.d = collection.toArray(new Object[collection.size()]);
+ this.d = (V[]) collection.toArray(new Object[collection.size()]); // Paper - Decompile fix
}
return this.d[random.nextInt(this.d.length)];
--
2.21.0