diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java index f5d165dfc..afacec7f8 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java @@ -1,5 +1,6 @@ package com.denizenscript.depenizen.bukkit.events.askyblock; +import com.denizenscript.denizencore.utilities.CoreUtilities; import com.wasteofplastic.askyblock.events.ChallengeCompleteEvent; import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData; import com.denizenscript.denizen.events.BukkitScriptEvent; @@ -38,7 +39,6 @@ public class PlayerCompletesSkyBlockChallengeScriptEvent extends BukkitScriptEve public ElementTag challenge; public ElementTag xp_reward; public ElementTag money_reward; - public ListTag item_rewards; public PlayerCompletesSkyBlockChallengeScriptEvent() { instance = this; @@ -71,6 +71,13 @@ else if (name.equals("money_reward")) { return money_reward; } else if (name.equals("item_rewards")) { + ListTag item_rewards = new ListTag(); + for (String i : event.getItemRewards()) { + ItemTag item = ItemTag.valueOf(i, CoreUtilities.basicContext); + if (item != null) { + item_rewards.addObject(item); + } + } return item_rewards; } return super.getContext(name); @@ -81,13 +88,6 @@ public void onPlayerCompletesSkyBlockChallenge(ChallengeCompleteEvent event) { challenge = new ElementTag(event.getChallengeName()); xp_reward = new ElementTag(event.getExpReward()); money_reward = new ElementTag(event.getMoneyReward()); - item_rewards = new ListTag(); - for (String i : event.getItemRewards()) { - ItemTag item = ItemTag.valueOf(i); - if (item != null) { - item_rewards.addObject(item); - } - } this.event = event; fire(event); } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/worldedit/WorldEditPlayerProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/worldedit/WorldEditPlayerProperties.java index c9735d65b..ca9fba634 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/properties/worldedit/WorldEditPlayerProperties.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/properties/worldedit/WorldEditPlayerProperties.java @@ -96,7 +96,7 @@ public String getAttribute(Attribute attribute) { WorldEditPlugin worldEdit = (WorldEditPlugin) WorldEditBridge.instance.plugin; ItemType itemType; if (attribute.hasContext(1)) { - itemType = BukkitAdapter.asItemType(deLegacy(ItemTag.valueOf(attribute.getContext(1)).getMaterial().getMaterial())); + itemType = BukkitAdapter.asItemType(deLegacy(ItemTag.valueOf(attribute.getContext(1), attribute.context).getMaterial().getMaterial())); } else { ItemStack itm = player.getEquipment().getItemInMainHand();