diff --git a/CraftBukkit-Patches/0054-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0054-Firework-Meta-Crash-Fix.patch
new file mode 100644
index 0000000000..b1949fc62e
--- /dev/null
+++ b/CraftBukkit-Patches/0054-Firework-Meta-Crash-Fix.patch
@@ -0,0 +1,31 @@
+From 3faf1eeeb14cc4ab9d8b33d791a83f0800076a9c Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Sat, 15 Jun 2013 21:34:48 +1000
+Subject: [PATCH] Firework Meta Crash Fix
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
+index 3f9e4a3..93a1ce0 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
+@@ -145,7 +145,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
+             case BURST:
+                 return 4;
+             default:
+-                throw new AssertionError(type);
++                throw new IllegalStateException(type.toString()); // Spigot
+         }
+     }
+ 
+@@ -162,7 +162,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
+             case 4:
+                 return Type.BURST;
+             default:
+-                throw new AssertionError(nbt);
++                throw new IllegalStateException(Integer.toString(nbt)); // Spigot
+         }
+     }
+ 
+-- 
+1.8.1.2
+