diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 2911d601fd..fc3d3f2a8b 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -774,4 +774,4 @@ public static Cancellable handleStatisticsIncrease(EntityHuman entityHuman, net.
         entityHuman.world.getServer().getPluginManager().callEvent(event);
         return (Cancellable) event;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
index b59d142a3f..18d6ca5fe7 100644
--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
+++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
@@ -1,18 +1,49 @@
 package org.bukkit.craftbukkit.potion;
 
+import java.util.HashMap;
+
 import net.minecraft.server.MobEffectList;
 
 import org.bukkit.potion.PotionEffectType;
 
 public class CraftPotionEffectType extends PotionEffectType {
     private final MobEffectList handle;
+    private HashMap<Integer, String> idToName;
 
     public CraftPotionEffectType(MobEffectList handle) {
         super(handle.id);
         this.handle = handle;
     }
 
-    @Override
+    private HashMap<Integer, String> initializeIdToNameMap() {
+    	HashMap<Integer, String> result = new HashMap<Integer, String>();
+    	result.put(1, "SPEED");
+    	result.put(2, "SLOW");
+    	result.put(3, "FAST_DIGGING");
+    	result.put(4, "SLOW_DIGGING");
+    	result.put(5, "INCREASE_DAMAGE");
+    	result.put(6, "HEAL");
+    	result.put(7, "HARM");
+    	result.put(8, "JUMP");
+    	result.put(9, "CONFUSION");
+    	result.put(10, "REGENERATION");
+    	result.put(11, "DAMAGE_RESISTANCE");
+    	result.put(12, "FIRE_RESISTANCE");
+    	result.put(13, "WATER_BREATHING");
+    	result.put(14, "INVISIBILITY");
+    	result.put(15, "BLINDNESS");
+    	result.put(16, "NIGHT_VISION");
+    	result.put(17, "HUNGER");
+    	result.put(18, "WEAKNESS");
+    	result.put(19, "POISON");
+    	result.put(20, "WITHER");
+    	result.put(21, "HEALTH_BOOST");
+    	result.put(22, "ABSORPTION");
+    	result.put(23, "SATURATION");
+    	return result;
+	}
+
+	@Override
     public double getDurationModifier() {
         return handle.getDurationModifier();
     }
@@ -23,56 +54,15 @@ public MobEffectList getHandle() {
 
     @Override
     public String getName() {
-        switch (handle.id) {
-        case 1:
-            return "SPEED";
-        case 2:
-            return "SLOW";
-        case 3:
-            return "FAST_DIGGING";
-        case 4:
-            return "SLOW_DIGGING";
-        case 5:
-            return "INCREASE_DAMAGE";
-        case 6:
-            return "HEAL";
-        case 7:
-            return "HARM";
-        case 8:
-            return "JUMP";
-        case 9:
-            return "CONFUSION";
-        case 10:
-            return "REGENERATION";
-        case 11:
-            return "DAMAGE_RESISTANCE";
-        case 12:
-            return "FIRE_RESISTANCE";
-        case 13:
-            return "WATER_BREATHING";
-        case 14:
-            return "INVISIBILITY";
-        case 15:
-            return "BLINDNESS";
-        case 16:
-            return "NIGHT_VISION";
-        case 17:
-            return "HUNGER";
-        case 18:
-            return "WEAKNESS";
-        case 19:
-            return "POISON";
-        case 20:
-            return "WITHER";
-        case 21:
-            return "HEALTH_BOOST";
-        case 22:
-            return "ABSORPTION";
-        case 23:
-            return "SATURATION";
-        default:
-            return "UNKNOWN_EFFECT_TYPE_" + handle.id;
-        }
+    	if(idToName == null){
+    		this.idToName = initializeIdToNameMap();
+    	}
+    	String name;
+    	name = idToName.get(handle.id);
+    	if(name == null){
+    		return "UNKNOWN_EFFECT_TYPE_" + handle.id;
+    	}
+    	return name;
     }
 
     @Override