From f66f7140ef6639fa25bae9f987db32bb925bb748 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Fri, 30 Oct 2015 18:58:30 -0700 Subject: [PATCH] Fix weird things happening in craft event --- .../scripts/containers/core/BukkitWorldScriptHelper.java | 3 +++ .../java/net/aufdemrand/denizen/utilities/midi/MidiUtil.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java index 2aea5d1685..d66f7afadb 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java @@ -165,6 +165,9 @@ public void craftItemEvent(PrepareItemCraftEvent event) { context.put("inventory", new dInventory(inventory)); Recipe recipe = event.getRecipe(); + if (recipe == null) { + return; + } dItem result = recipe.getResult() != null ? new dItem(recipe.getResult()) : null; if (result != null) { context.put("item", result); diff --git a/src/main/java/net/aufdemrand/denizen/utilities/midi/MidiUtil.java b/src/main/java/net/aufdemrand/denizen/utilities/midi/MidiUtil.java index 886e0b3b91..67fa9540cd 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/midi/MidiUtil.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/midi/MidiUtil.java @@ -73,7 +73,6 @@ public static void playMidi(File file, float tempo, float volume, dLocation loca public static void stopMidi(String object) { if (receivers.containsKey(object)) { receivers.get(object).close(); - receivers.remove(object); } }