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

Correct permission condition loading, fixes #1805

Browse Source
This commit is contained in:
PikaMug 2021-09-27 15:56:22 -04:00
parent 1fcca05658
commit d5f3f7f10e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/src/main/java/me/blackvein/quests/Quests.java
View File

@ -3753,22 +3753,24 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
} }
if (data.contains(conditionKey + "ride-npc")) { if (data.contains(conditionKey + "ride-npc")) {
if (ConfigUtil.checkList(data.getList(conditionKey + "ride-npc"), Integer.class)) { if (ConfigUtil.checkList(data.getList(conditionKey + "ride-npc"), Integer.class)) {
final LinkedList<Integer> npcs = new LinkedList<>(); final LinkedList<Integer> npcList = new LinkedList<>();
for (final int i : data.getIntegerList(conditionKey + "ride-npc")) { for (final int i : data.getIntegerList(conditionKey + "ride-npc")) {
if (i < 0) { if (i < 0) {
throw new ConditionFormatException("ride-npc is not a valid NPC ID", throw new ConditionFormatException("ride-npc is not a valid NPC ID",
conditionKey); conditionKey);
} }
npcs.add(i); npcList.add(i);
} }
condition.setNpcsWhileRiding(npcs); condition.setNpcsWhileRiding(npcList);
} else { } else {
throw new ConditionFormatException("ride-npc is not a list of NPC IDs", conditionKey); throw new ConditionFormatException("ride-npc is not a list of NPC IDs", conditionKey);
} }
} }
if (data.contains(conditionKey + "permission")) { if (data.contains(conditionKey + "permission")) {
if (ConfigUtil.checkList(data.getList(conditionKey + "permission"), String.class)) { if (ConfigUtil.checkList(data.getList(conditionKey + "permission"), String.class)) {
condition.setPermissions((LinkedList<String>) data.getStringList(conditionKey + "permission")); final LinkedList<String> permissions
= new LinkedList<>(data.getStringList(conditionKey + "permission"));
condition.setPermissions(permissions);
} else { } else {
throw new ConditionFormatException("permission is not a list of permissions", conditionKey); throw new ConditionFormatException("permission is not a list of permissions", conditionKey);
} }
@ -3776,8 +3778,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
if (data.contains(conditionKey + "hold-main-hand")) { if (data.contains(conditionKey + "hold-main-hand")) {
final LinkedList<ItemStack> temp = new LinkedList<>(); final LinkedList<ItemStack> temp = new LinkedList<>();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final final List<ItemStack> stackList = (List<ItemStack>) data.get(conditionKey + "hold-main-hand");
List<ItemStack> stackList = (List<ItemStack>) data.get(conditionKey + "hold-main-hand");
if (ConfigUtil.checkList(stackList, ItemStack.class)) { if (ConfigUtil.checkList(stackList, ItemStack.class)) {
for (final ItemStack stack : stackList) { for (final ItemStack stack : stackList) {
if (stack != null) { if (stack != null) {