mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-28 07:29:40 +02:00
fb25dc17c6
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 Bukkit Changes: da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 0cef14e4 Remove draft API from selectEntities CraftBukkit Changes:a46fdbc6Remove outdated build delay.3697519bSPIGOT-4708: Fix ExactChoice recipes neglecting material9ead7009SPIGOT-4677: Add minecraft.admin.command_feedback permissionc3749a23Remove the Damage tag from items when it is 0.f74c7b95SPIGOT-4706: Can't interact with active item494eef45Mention requirement of JIRA ticket for bug fixes51d62decSPIGOT-4702: Exception when middle clicking certain slotsbe557e69SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From 6287458c83ada09b092886a8aa35534838222ed2 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 1521ed759b..78de740acf 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
|
|
|