From fca5f9ec9813243fb2dc80ea81536191e4aaad36 Mon Sep 17 00:00:00 2001 From: GJ Date: Thu, 16 May 2013 09:23:35 -0400 Subject: [PATCH] We shouldn't need to do this. If issues arise, then there's a bug in Bukkit that needs patching. --- .../java/com/gmail/nossr50/util/Misc.java | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/src/main/java/com/gmail/nossr50/util/Misc.java index 6067f1edd..d662a91e4 100644 --- a/src/main/java/com/gmail/nossr50/util/Misc.java +++ b/src/main/java/com/gmail/nossr50/util/Misc.java @@ -95,11 +95,13 @@ public final class Misc { return false; } - if (first.distanceSquared(second) < (maxDistance * maxDistance)) { - return true; - } + return first.distanceSquared(second) < (maxDistance * maxDistance); + } - return false; + public static void dropItems(Location location, Collection drops) { + for (ItemStack drop : drops) { + dropItem(location, drop); + } } /** @@ -152,7 +154,6 @@ public final class Misc { * @param itemStack The item to drop */ public static void dropItem(Location location, ItemStack itemStack) { - if (itemStack.getType() == Material.AIR) { return; } @@ -165,12 +166,7 @@ public final class Misc { return; } - Item newItem = location.getWorld().dropItemNaturally(location, itemStack); - - ItemStack cloned = itemStack.clone(); - cloned.setAmount(newItem.getItemStack().getAmount()); - - newItem.setItemStack(cloned); + location.getWorld().dropItemNaturally(location, itemStack); } public static void profileCleanup(String playerName) { @@ -207,10 +203,4 @@ public final class Misc { public static Random getRandom() { return random; } - - public static void dropItems(Location location, Collection drops) { - for (ItemStack drop : drops) { - dropItem(location, drop); - } - } }