From 6b3989408918b7ac11178d74f36ea843757aabdd Mon Sep 17 00:00:00 2001 From: kireevm96 Date: Thu, 11 Mar 2021 11:09:21 +0300 Subject: [PATCH 1/3] Fix conflict enchantment --- .../enchantments/support/obtaining/VillagerListeners.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java index 2a6180da..76972cd3 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java @@ -177,7 +177,11 @@ public class VillagerListeners extends PluginDependent implements Listener { if (enchant.conflictsWith(enchantment)) { anyConflicts.set(true); } - + + if (enchantment.conflictsWith(enchant)) { + anyConflicts.set(true); + } + EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchant); if (enchantment.getType().equals(ecoEnchant.getType()) && ecoEnchant.getType().isSingular()) { From fa0268fa375b1e5ff7b1282f35922009136a863b Mon Sep 17 00:00:00 2001 From: kireevm96 Date: Thu, 11 Mar 2021 11:12:31 +0300 Subject: [PATCH 2/3] Removed extra spaces --- build.gradle | 2 +- .../enchantments/support/obtaining/VillagerListeners.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index fa24f685..86261107 100644 --- a/build.gradle +++ b/build.gradle @@ -96,7 +96,7 @@ jar { group = 'com.willfp' archivesBaseName = project.name version = findProperty("version") -java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.sourceCompatibility = JavaVersion.VERSION_11 compileJava.options.encoding = 'UTF-8' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java index 76972cd3..e60d71ab 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java @@ -177,11 +177,11 @@ public class VillagerListeners extends PluginDependent implements Listener { if (enchant.conflictsWith(enchantment)) { anyConflicts.set(true); } - + if (enchantment.conflictsWith(enchant)) { anyConflicts.set(true); } - + EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchant); if (enchantment.getType().equals(ecoEnchant.getType()) && ecoEnchant.getType().isSingular()) { From 7ca0a4fc020c51dc802151aa213ac62911cb66d2 Mon Sep 17 00:00:00 2001 From: kireevm96 Date: Thu, 11 Mar 2021 11:13:46 +0300 Subject: [PATCH 3/3] revert build --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 86261107..fa24f685 100644 --- a/build.gradle +++ b/build.gradle @@ -96,7 +96,7 @@ jar { group = 'com.willfp' archivesBaseName = project.name version = findProperty("version") -java.sourceCompatibility = JavaVersion.VERSION_11 +java.sourceCompatibility = JavaVersion.VERSION_1_8 compileJava.options.encoding = 'UTF-8'