From bbe66b29852e87718433e89c7982cfab5c6c5b8c Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Sun, 15 Jan 2012 09:18:20 +0000 Subject: [PATCH] Changed Material to use an array for lookups, instead of a hashmap. Thanks to zml2008 for the PR By: Nathan Adams --- .../src/main/java/org/bukkit/Material.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/Material.java b/paper-api/src/main/java/org/bukkit/Material.java index c0bafe8876..49e47993db 100644 --- a/paper-api/src/main/java/org/bukkit/Material.java +++ b/paper-api/src/main/java/org/bukkit/Material.java @@ -2,11 +2,13 @@ package org.bukkit; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.material.*; +import org.bukkit.util.Java15Compat; /** * An enum of all material ids accepted by the official server + client @@ -278,7 +280,7 @@ public enum Material { private final int id; private final Class data; - private static final Map lookupId = new HashMap(); + private static Material[] lookupId = new Material[3200]; private static final Map lookupName = new HashMap(); private final int maxStack; private final short durability; @@ -419,7 +421,11 @@ public enum Material { * @return Material if found, or null */ public static Material getMaterial(final int id) { - return lookupId.get(id); + if (lookupId.length > id) { + return lookupId[id]; + } else { + return null; + } } /** @@ -461,7 +467,12 @@ public enum Material { static { for (Material material : values()) { - lookupId.put(material.getId(), material); + if (lookupId.length > material.id) { + lookupId[material.id] = material; + } else { + lookupId = Java15Compat.Arrays_copyOfRange(lookupId, 0, material.id + 2); + lookupId[material.id] = material; + } lookupName.put(material.name(), material); } }