itemscript supported by item requirement, itemscripts use addUnsafeEn…

…chant
DenizenScript · Mar 7, 2013 · 392549b · 392549b
1 parent ba066f2
commit 392549b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptContainer.java
@@ -73,7 +73,7 @@ public Item getItemFrom(Player player, dNPC npc) {
                         }
                         // Add enchantment
                         Enchantment ench = Enchantment.getByName(enchantment.toUpperCase());
-                        stack.addEnchantment(ench, level);
+                        stack.addUnsafeEnchantment(ench, level);
                     } catch (Exception e) {
                         // Invalid enchantment information, let's try the next entry
                         continue;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ItemRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ItemRequirement.java
@@ -2,18 +2,21 @@
 
 import java.util.List;
 
-import org.bukkit.inventory.ItemStack;
-
 import net.aufdemrand.denizen.exceptions.RequirementCheckException;
+import net.aufdemrand.denizen.scripts.ScriptRegistry;
+import net.aufdemrand.denizen.scripts.containers.core.ItemScriptContainer;
 import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement;
 import net.aufdemrand.denizen.scripts.requirements.RequirementsContext;
 import net.aufdemrand.denizen.utilities.arguments.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 
+import org.bukkit.inventory.ItemStack;
+
 public class ItemRequirement extends AbstractRequirement {
 
 	Integer quantity = 1;
 	ItemStack item = null;
+	ItemScriptContainer itemContainer = null;
 
 	@Override
 	public boolean check(RequirementsContext context, List<String> args)
@@ -25,10 +28,15 @@ public boolean check(RequirementsContext context, List<String> args)
 				continue;
 
 			} else if (aH.matchesItem(arg)) {
-				item = aH.getItemFrom(arg);
-				dB.echoDebug("...ITEM set");
-				continue;
-
+				if (ScriptRegistry.getScriptContainerAs(aH.getStringFrom(arg), ItemScriptContainer.class) != null) {
+					item = ScriptRegistry.getScriptContainerAs(aH.getStringFrom(arg), ItemScriptContainer.class).getItemFrom(context.getPlayer(), context.getNPC());
+					dB.echoDebug("...ITEM set from script");
+					continue;
+				} else {
+					item = aH.getItemFrom(arg);
+					dB.echoDebug("...ITEM set");
+					continue;
+				}
 			} else if (aH.matchesItem("item:" + arg)) {
 				item = aH.getItemFrom("item:" + arg);
 				dB.echoDebug("...ITEM set");