From 4dd67922764a7f885bf878d0cbb880c03c467666 Mon Sep 17 00:00:00 2001 From: nulli0n Date: Mon, 29 May 2023 09:32:30 +0600 Subject: [PATCH] v3.4.1 --- Core/pom.xml | 14 +++++++------- .../enchantment/impl/weapon/EnchantConfusion.java | 2 +- .../enchantment/impl/weapon/EnchantCutter.java | 2 +- .../enchantment/impl/weapon/EnchantExhaust.java | 2 +- .../excellentenchants/tier/TierManager.java | 3 ++- NMS/pom.xml | 2 +- V1_17_R1/pom.xml | 4 ++-- V1_18_R2/pom.xml | 4 ++-- V1_19_R1/pom.xml | 4 ++-- V1_19_R2/pom.xml | 4 ++-- V1_19_R3/pom.xml | 4 ++-- pom.xml | 2 +- 12 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Core/pom.xml b/Core/pom.xml index 374e291..91ee7f1 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -5,7 +5,7 @@ ExcellentEnchants su.nightexpress.excellentenchants - 3.4.0 + 3.4.1 4.0.0 @@ -72,32 +72,32 @@ su.nightexpress.excellentenchants NMS - 3.4.0 + 3.4.1 su.nightexpress.excellentenchants V1_19_R3 - 3.4.0 + 3.4.1 su.nightexpress.excellentenchants V1_19_R2 - 3.4.0 + 3.4.1 su.nightexpress.excellentenchants V1_19_R1 - 3.4.0 + 3.4.1 su.nightexpress.excellentenchants V1_18_R2 - 3.4.0 + 3.4.1 su.nightexpress.excellentenchants V1_17_R1 - 3.4.0 + 3.4.1 fr.neatmonster diff --git a/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantConfusion.java b/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantConfusion.java index a88928e..aa456a1 100644 --- a/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantConfusion.java +++ b/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantConfusion.java @@ -68,7 +68,7 @@ public class EnchantConfusion extends ExcellentEnchant implements Chanced, Potio if (!this.addEffect(victim, level)) return false; if (this.hasVisualEffects()) { - SimpleParticle.of(Particle.ITEM_CRACK, Material.ROTTEN_FLESH) + SimpleParticle.of(Particle.ITEM_CRACK, new ItemStack(Material.ROTTEN_FLESH)) .play(victim.getEyeLocation(), 0.25, 0.1, 30); } return true; diff --git a/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantCutter.java b/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantCutter.java index 3f9b8c6..3e22cf5 100644 --- a/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantCutter.java +++ b/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantCutter.java @@ -97,7 +97,7 @@ public class EnchantCutter extends ExcellentEnchant implements Chanced, CombatEn drop.getVelocity().multiply(3D); if (this.hasVisualEffects()) { - SimpleParticle.of(Particle.ITEM_CRACK, itemCut.getType()).play(victim.getEyeLocation(), 0.25, 0.15, 30); + SimpleParticle.of(Particle.ITEM_CRACK, itemCut).play(victim.getEyeLocation(), 0.25, 0.15, 30); MessageUtil.sound(victim.getLocation(), Sound.ENTITY_ITEM_BREAK); } return true; diff --git a/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantExhaust.java b/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantExhaust.java index d0345b8..ad671b6 100644 --- a/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantExhaust.java +++ b/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/weapon/EnchantExhaust.java @@ -68,7 +68,7 @@ public class EnchantExhaust extends ExcellentEnchant implements Chanced, Potione if (!this.addEffect(victim, level)) return false; if (this.hasVisualEffects()) { - SimpleParticle.of(Particle.ITEM_CRACK, Material.ROTTEN_FLESH).play(victim.getEyeLocation(), 0.25, 0.1, 30); + SimpleParticle.of(Particle.ITEM_CRACK, new ItemStack(Material.ROTTEN_FLESH)).play(victim.getEyeLocation(), 0.25, 0.1, 30); } return true; } diff --git a/Core/src/main/java/su/nightexpress/excellentenchants/tier/TierManager.java b/Core/src/main/java/su/nightexpress/excellentenchants/tier/TierManager.java index a0cbc46..86ccaea 100644 --- a/Core/src/main/java/su/nightexpress/excellentenchants/tier/TierManager.java +++ b/Core/src/main/java/su/nightexpress/excellentenchants/tier/TierManager.java @@ -10,6 +10,7 @@ import su.nightexpress.excellentenchants.ExcellentEnchants; import su.nightexpress.excellentenchants.enchantment.type.ObtainType; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; public class TierManager extends AbstractManager { @@ -21,7 +22,7 @@ public class TierManager extends AbstractManager { public TierManager(@NotNull ExcellentEnchants plugin) { super(plugin); - this.tiers = new HashMap<>(); + this.tiers = new ConcurrentHashMap<>(); } diff --git a/NMS/pom.xml b/NMS/pom.xml index 5879297..1114606 100644 --- a/NMS/pom.xml +++ b/NMS/pom.xml @@ -5,7 +5,7 @@ ExcellentEnchants su.nightexpress.excellentenchants - 3.4.0 + 3.4.1 4.0.0 diff --git a/V1_17_R1/pom.xml b/V1_17_R1/pom.xml index 8e7f38f..18bfc79 100644 --- a/V1_17_R1/pom.xml +++ b/V1_17_R1/pom.xml @@ -5,7 +5,7 @@ ExcellentEnchants su.nightexpress.excellentenchants - 3.4.0 + 3.4.1 4.0.0 @@ -26,7 +26,7 @@ su.nightexpress.excellentenchants NMS - 3.4.0 + 3.4.1 diff --git a/V1_18_R2/pom.xml b/V1_18_R2/pom.xml index 6f81230..8621259 100644 --- a/V1_18_R2/pom.xml +++ b/V1_18_R2/pom.xml @@ -5,7 +5,7 @@ ExcellentEnchants su.nightexpress.excellentenchants - 3.4.0 + 3.4.1 4.0.0 @@ -26,7 +26,7 @@ su.nightexpress.excellentenchants NMS - 3.4.0 + 3.4.1 diff --git a/V1_19_R1/pom.xml b/V1_19_R1/pom.xml index cae16e3..ccc39d1 100644 --- a/V1_19_R1/pom.xml +++ b/V1_19_R1/pom.xml @@ -5,7 +5,7 @@ ExcellentEnchants su.nightexpress.excellentenchants - 3.4.0 + 3.4.1 4.0.0 @@ -26,7 +26,7 @@ su.nightexpress.excellentenchants NMS - 3.4.0 + 3.4.1 diff --git a/V1_19_R2/pom.xml b/V1_19_R2/pom.xml index 8d443db..055a99d 100644 --- a/V1_19_R2/pom.xml +++ b/V1_19_R2/pom.xml @@ -5,7 +5,7 @@ ExcellentEnchants su.nightexpress.excellentenchants - 3.4.0 + 3.4.1 4.0.0 @@ -26,7 +26,7 @@ su.nightexpress.excellentenchants NMS - 3.4.0 + 3.4.1 diff --git a/V1_19_R3/pom.xml b/V1_19_R3/pom.xml index d94498d..f60cc8b 100644 --- a/V1_19_R3/pom.xml +++ b/V1_19_R3/pom.xml @@ -5,7 +5,7 @@ ExcellentEnchants su.nightexpress.excellentenchants - 3.4.0 + 3.4.1 4.0.0 @@ -26,7 +26,7 @@ su.nightexpress.excellentenchants NMS - 3.4.0 + 3.4.1 diff --git a/pom.xml b/pom.xml index dec9a7b..63c1ec0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ su.nightexpress.excellentenchants ExcellentEnchants pom - 3.4.0 + 3.4.1 Core NMS