Remove some CraftBukkit pull requests that don't have any functional benefit at the moment.

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-06-21 16:49:33 +10:00
parent d37cc8ebee
commit 0aabcddfa8
35 changed files with 64 additions and 197 deletions

View File

@@ -0,0 +1,31 @@
From 74402ddfe7d7f0a239f0ee650d08fcde49e5ca46 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