From 310ab9a92cd820b13893cfbe9f01b689dab83291 Mon Sep 17 00:00:00 2001
From: Morphan1 <morphanone@gmail.com>
Date: Fri, 14 Oct 2016 17:52:58 -0400
Subject: [PATCH] Register custom entity types

---
 plugin/src/main/java/net/aufdemrand/denizen/Denizen.java  | 8 ++++++++
 .../denizen/scripts/containers/core/ItemScriptHelper.java | 1 +
 2 files changed, 9 insertions(+)

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java
index 3b13433c16..268df4779a 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -14,6 +14,9 @@
 import net.aufdemrand.denizen.listeners.ListenerRegistry;
 import net.aufdemrand.denizen.nms.NMSHandler;
 import net.aufdemrand.denizen.nms.NMSVersion;
+import net.aufdemrand.denizen.nms.interfaces.FakeArrow;
+import net.aufdemrand.denizen.nms.interfaces.FakePlayer;
+import net.aufdemrand.denizen.nms.interfaces.ItemProjectile;
 import net.aufdemrand.denizen.npc.dNPCRegistry;
 import net.aufdemrand.denizen.npc.speech.DenizenChat;
 import net.aufdemrand.denizen.npc.traits.*;
@@ -48,6 +51,7 @@
 import net.aufdemrand.denizen.utilities.debugging.StatsRecord;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.depends.Depends;
+import net.aufdemrand.denizen.utilities.entity.DenizenEntityType;
 import net.aufdemrand.denizen.utilities.maps.DenizenMapManager;
 import net.aufdemrand.denizen.utilities.packets.DenizenPacketHandler;
 import net.aufdemrand.denizencore.DenizenCore;
@@ -431,6 +435,10 @@ public void onEnable() {
                 Depends.citizens.registerCommandClass(NPCCommandHandler.class);
             }
 
+            DenizenEntityType.registerEntityType("ITEM_PROJECTILE", ItemProjectile.class);
+            DenizenEntityType.registerEntityType("FAKE_ARROW", FakeArrow.class);
+            DenizenEntityType.registerEntityType("FAKE_PLAYER", FakePlayer.class);
+
             // Track all player names for quick dPlayer matching
             for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
                 dPlayer.notePlayer(player);
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptHelper.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptHelper.java
index 47f758f314..47d98faed7 100644
--- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptHelper.java
+++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptHelper.java
@@ -375,6 +375,7 @@ public void run() {
                             event.recipe = recipeList;
                             event.inventory = inventory;
                             event.player = dPlayer.mirrorBukkitPlayer(player);
+                            event.cancelled = false;
                             event.fire();
                             if (event.cancelled) {
                                 inventory.setResult(null);