diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java index 04fcb04f..ddc0aa7b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java @@ -25,7 +25,6 @@ public final class Dullness extends EcoEnchant { return; } - if(!EnchantmentUtils.passedChance(this, level)) return; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java index bce94bb9..ee01f8d7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java @@ -32,7 +32,7 @@ public final class Frozen extends EcoEnchant { Player player = (Player) event.getEntity(); LivingEntity victim = (LivingEntity) event.getDamager(); - final int points = EnchantChecks.getArmorPoints(player, this, 1); + final int points = EnchantChecks.getArmorPoints(player, this, 0); if (points == 0) return; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java index ecfa8159..6c0eaca4 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java @@ -39,6 +39,6 @@ public final class Launch extends EcoEnchant { double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); double boost = 1 + (multiplier * level); - Bukkit.getScheduler().runTaskLater(EcoEnchantsPlugin.getInstance(), () -> player.setVelocity(player.getVelocity().multiply(boost)), 1); + Bukkit.getScheduler().runTask(EcoEnchantsPlugin.getInstance(), () -> player.setVelocity(player.getVelocity().multiply(boost))); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/plugins/AntigriefGriefPrevention.java b/Plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/plugins/AntigriefGriefPrevention.java index f3c150fc..2e380b69 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/plugins/AntigriefGriefPrevention.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/plugins/AntigriefGriefPrevention.java @@ -42,7 +42,7 @@ public final class AntigriefGriefPrevention implements AntigriefWrapper { if(victim instanceof Player) { return claim == null; } else { - if (claim != null) { + if (claim != null && claim.ownerID != null) { return claim.ownerID.equals(player.getUniqueId()); } return true; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/integrations/anvilgui/plugins/AnvilGUIImpl.java b/Plugin/src/main/java/com/willfp/ecoenchants/integrations/anvilgui/plugins/AnvilGUIImpl.java index cfbea64d..fd8b31d0 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/integrations/anvilgui/plugins/AnvilGUIImpl.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/integrations/anvilgui/plugins/AnvilGUIImpl.java @@ -4,24 +4,16 @@ import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.integrations.anvilgui.AnvilGUIIntegration; public class AnvilGUIImpl implements AnvilGUIIntegration { - private static Class ANVIL_GUI_CLASS = null; + private static final String ANVIL_GUI_CLASS = "net.wesjd.anvilgui.version.Wrapper" + EcoEnchantsPlugin.NMS_VERSION.substring(1) + "$AnvilContainer"; @Override public boolean isInstance(Object object) { assert ANVIL_GUI_CLASS != null; - return object.getClass().equals(ANVIL_GUI_CLASS); + return object.getClass().toString().equals(ANVIL_GUI_CLASS); } @Override public String getPluginName() { return "AnvilGUI"; } - - static { - try { - ANVIL_GUI_CLASS = Class.forName("net.wesjd.anvilgui.version.Wrapper" + EcoEnchantsPlugin.NMS_VERSION.substring(1) + "$AnvilContainer"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - } } diff --git a/Plugin/src/main/resources/enchants/normal/flinch.yml b/Plugin/src/main/resources/enchants/normal/flinch.yml index 19a76c32..16feb5d3 100644 --- a/Plugin/src/main/resources/enchants/normal/flinch.yml +++ b/Plugin/src/main/resources/enchants/normal/flinch.yml @@ -21,4 +21,4 @@ general-config: config: chance-per-level: 2.5 - ticks-per-level: 5 \ No newline at end of file + ticks-per-level: 10 \ No newline at end of file