Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-02-08 08:31:19 +01:00
Code Issues Projects Releases Wiki Activity

Allow unsafe enchantments on item delivery objectives, per #1704

Browse Source
This commit is contained in:
PikaMug 2021-05-30 02:01:38 -04:00
parent 989d3d4bc4
commit 639769d999
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -3284,13 +3284,7 @@ public class Quester implements Comparable<Quester> {
if (quest.getStage(stage).itemsToConsume.isEmpty() == false) { if (quest.getStage(stage).itemsToConsume.isEmpty() == false) {
for (final ItemStack i : quest.getStage(stage).itemsToConsume) { for (final ItemStack i : quest.getStage(stage).itemsToConsume) {
final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability()); final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
try { temp.addUnsafeEnchantments(i.getEnchantments());
temp.addEnchantments(i.getEnchantments());
} catch (final Exception e) {
plugin.getLogger().warning("Unable to add enchantment(s) " + i.getEnchantments().toString()
+ " to consume item " + i.getType().name() + " x " + i.getAmount() + " for quest ID "
+ quest.getId());
}
temp.setItemMeta(i.getItemMeta()); temp.setItemMeta(i.getItemMeta());
data.itemsConsumed.add(temp); data.itemsConsumed.add(temp);
} }
@ -3298,13 +3292,7 @@ public class Quester implements Comparable<Quester> {
if (quest.getStage(stage).itemsToDeliver.isEmpty() == false) { if (quest.getStage(stage).itemsToDeliver.isEmpty() == false) {
for (final ItemStack i : quest.getStage(stage).itemsToDeliver) { for (final ItemStack i : quest.getStage(stage).itemsToDeliver) {
final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability()); final ItemStack temp = new ItemStack(i.getType(), 0, i.getDurability());
try { temp.addUnsafeEnchantments(i.getEnchantments());
temp.addEnchantments(i.getEnchantments());
} catch (final Exception e) {
plugin.getLogger().warning("Unable to add enchantment(s) " + i.getEnchantments().toString()
+ " to delivery item " + i.getType().name() + " x " + i.getAmount() + " for quest ID "
+ quest.getId());
}
temp.setItemMeta(i.getItemMeta()); temp.setItemMeta(i.getItemMeta());
data.itemsDelivered.add(temp); data.itemsDelivered.add(temp);
} }

8
main/src/main/java/me/blackvein/quests/storage/implementation/file/SeparatedYamlStorage.java
View File

@ -337,13 +337,7 @@ public class SeparatedYamlStorage implements StorageImplementation {
for (final int amt : deliveryAmounts) { for (final int amt : deliveryAmounts) {
final ItemStack is = quester.getCurrentStage(quest).getItemsToDeliver().get(index); final ItemStack is = quester.getCurrentStage(quest).getItemsToDeliver().get(index);
final ItemStack temp = new ItemStack(is.getType(), amt, is.getDurability()); final ItemStack temp = new ItemStack(is.getType(), amt, is.getDurability());
try { temp.addUnsafeEnchantments(is.getEnchantments());
temp.addEnchantments(is.getEnchantments());
} catch (final Exception e) {
plugin.getLogger().warning("Unable to add enchantment(s) " + is.getEnchantments().toString()
+ " to delivery item " + is.getType().name() + " x " + amt + " for quest "
+ quest.getName());
}
temp.setItemMeta(is.getItemMeta()); temp.setItemMeta(is.getItemMeta());
if (quester.getQuestData(quest).itemsDelivered.size() > 0) { if (quester.getQuestData(quest).itemsDelivered.size() > 0) {
quester.getQuestData(quest).itemsDelivered.set(index, temp); quester.getQuestData(quest).itemsDelivered.set(index, temp);