From 03f8d1b84c04d72a9937d6b123709be3abad4e41 Mon Sep 17 00:00:00 2001
From: PretzelJohn <58197328+PretzelJohn@users.noreply.github.com>
Date: Mon, 20 Mar 2023 19:02:43 -0400
Subject: [PATCH] Version 1.6.3: * Fixed case sensitivity for disabled items
and professions in config * Updated version
---
pom.xml | 2 +-
.../listeners/VillagerListener.java | 16 ++++++++++------
src/main/resources/plugin.yml | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e68bbf..778a0c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.pretzel.dev
VillagerTradeLimiter
- 1.6.2
+ 1.6.3
1.8
diff --git a/src/com/pretzel/dev/villagertradelimiter/listeners/VillagerListener.java b/src/com/pretzel/dev/villagertradelimiter/listeners/VillagerListener.java
index 38c4b93..34d27cf 100644
--- a/src/com/pretzel/dev/villagertradelimiter/listeners/VillagerListener.java
+++ b/src/com/pretzel/dev/villagertradelimiter/listeners/VillagerListener.java
@@ -4,7 +4,6 @@ import com.pretzel.dev.villagertradelimiter.VillagerTradeLimiter;
import com.pretzel.dev.villagertradelimiter.data.Cooldown;
import com.pretzel.dev.villagertradelimiter.data.PlayerData;
import com.pretzel.dev.villagertradelimiter.settings.Settings;
-import org.bukkit.entity.Item;
import org.bukkit.entity.Villager;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@@ -45,9 +44,11 @@ public class VillagerListener implements Listener {
//Checks each item if it should be removed from the trade list
for(ItemStack item : items) {
- if(disabledItems.contains(item.getType().name().toLowerCase())) {
- event.setCancelled(true);
- return;
+ for(String disabledItem : disabledItems) {
+ if(disabledItem.equalsIgnoreCase(item.getType().name())) {
+ event.setCancelled(true);
+ return;
+ }
}
}
}
@@ -62,8 +63,11 @@ public class VillagerListener implements Listener {
List disabledProfessions = instance.getCfg().getStringList("DisableProfessions");
//Changes the new profession to none if disabled in config
- if(disabledProfessions.contains(profession.name().toLowerCase())) {
- event.setProfession(Villager.Profession.NONE);
+ for(String disabledProfession : disabledProfessions) {
+ if(disabledProfession.equalsIgnoreCase(profession.name())) {
+ event.setProfession(Villager.Profession.NONE);
+ return;
+ }
}
}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 59cf9b3..3de274b 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
name: VillagerTradeLimiter
author: PretzelJohn
main: com.pretzel.dev.villagertradelimiter.VillagerTradeLimiter
-version: 1.6.2
+version: 1.6.3
api-version: 1.14
commands: