835bc39b03
Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 02c2f6575eb8ecea97cbd43517c6cdabb2879174 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 2aa6f89c18..1974baff83 100644
|
|
--- a/src/main/java/net/minecraft/server/RegistryMaterials.java
|
|
+++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
|
|
@@ -14,8 +14,8 @@ 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 final RegistryID<V> b = new RegistryID<>(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 Object[] d;
|
|
private int x;
|
|
|
|
@@ -92,7 +92,7 @@ public class RegistryMaterials<V> implements IRegistry<V> {
|
|
this.d = set.toArray(new Object[set.size()]);
|
|
}
|
|
|
|
- return this.d[random.nextInt(this.d.length)];
|
|
+ return (V) this.d[random.nextInt(this.d.length)]; // Paper - decompile fix
|
|
}
|
|
|
|
public boolean c(MinecraftKey minecraftkey) {
|
|
--
|
|
2.18.0
|
|
|