From 7c142c1a8ed092aec70c07b5b2d3c5858ae7ee01 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 19 Apr 2024 21:01:48 -0400 Subject: [PATCH] enabled enchant --- .../enchants/bow/DevilChicks.java | 2 +- .../thepitremake/enchants/bow/LuckyShot.java | 2 +- .../thepitremake/enchants/bow/Parasite.java | 2 +- .../thepitremake/enchants/bow/Robinhood.java | 2 +- .../thepitremake/enchants/bow/Volley.java | 2 +- .../enchants/sword/ComboStun.java | 2 +- .../enchants/sword/Grasshopper.java | 22 ------------------- 7 files changed, 6 insertions(+), 28 deletions(-) diff --git a/src/me/stevemmmmm/thepitremake/enchants/bow/DevilChicks.java b/src/me/stevemmmmm/thepitremake/enchants/bow/DevilChicks.java index 28fe36a..857c5ae 100644 --- a/src/me/stevemmmmm/thepitremake/enchants/bow/DevilChicks.java +++ b/src/me/stevemmmmm/thepitremake/enchants/bow/DevilChicks.java @@ -122,7 +122,7 @@ public ArrayList getDescription(int level) { @Override public boolean isDisabledOnPassiveWorld() { - return true; + return false; } @Override diff --git a/src/me/stevemmmmm/thepitremake/enchants/bow/LuckyShot.java b/src/me/stevemmmmm/thepitremake/enchants/bow/LuckyShot.java index 3b50282..f4da88b 100644 --- a/src/me/stevemmmmm/thepitremake/enchants/bow/LuckyShot.java +++ b/src/me/stevemmmmm/thepitremake/enchants/bow/LuckyShot.java @@ -105,7 +105,7 @@ public ArrayList getDescription(int level) { @Override public boolean isDisabledOnPassiveWorld() { - return true; + return false; } @Override diff --git a/src/me/stevemmmmm/thepitremake/enchants/bow/Parasite.java b/src/me/stevemmmmm/thepitremake/enchants/bow/Parasite.java index 596bf95..f31a92e 100644 --- a/src/me/stevemmmmm/thepitremake/enchants/bow/Parasite.java +++ b/src/me/stevemmmmm/thepitremake/enchants/bow/Parasite.java @@ -53,7 +53,7 @@ public ArrayList getDescription(int level) { @Override public boolean isDisabledOnPassiveWorld() { - return true; + return false; } @Override diff --git a/src/me/stevemmmmm/thepitremake/enchants/bow/Robinhood.java b/src/me/stevemmmmm/thepitremake/enchants/bow/Robinhood.java index 00d24f9..736327d 100644 --- a/src/me/stevemmmmm/thepitremake/enchants/bow/Robinhood.java +++ b/src/me/stevemmmmm/thepitremake/enchants/bow/Robinhood.java @@ -165,7 +165,7 @@ public ArrayList getDescription(int level) { @Override public boolean isDisabledOnPassiveWorld() { - return true; + return false; } @Override diff --git a/src/me/stevemmmmm/thepitremake/enchants/bow/Volley.java b/src/me/stevemmmmm/thepitremake/enchants/bow/Volley.java index 727a256..a236b6d 100644 --- a/src/me/stevemmmmm/thepitremake/enchants/bow/Volley.java +++ b/src/me/stevemmmmm/thepitremake/enchants/bow/Volley.java @@ -103,7 +103,7 @@ public ArrayList getDescription(int level) { @Override public boolean isDisabledOnPassiveWorld() { - return true; + return false; } @Override diff --git a/src/me/stevemmmmm/thepitremake/enchants/sword/ComboStun.java b/src/me/stevemmmmm/thepitremake/enchants/sword/ComboStun.java index 05be6ee..6136241 100644 --- a/src/me/stevemmmmm/thepitremake/enchants/sword/ComboStun.java +++ b/src/me/stevemmmmm/thepitremake/enchants/sword/ComboStun.java @@ -90,7 +90,7 @@ public ArrayList getDescription(int level) { @Override public boolean isDisabledOnPassiveWorld() { - return true; + return false; } @Override diff --git a/src/me/stevemmmmm/thepitremake/enchants/sword/Grasshopper.java b/src/me/stevemmmmm/thepitremake/enchants/sword/Grasshopper.java index 1bca059..19a571d 100644 --- a/src/me/stevemmmmm/thepitremake/enchants/sword/Grasshopper.java +++ b/src/me/stevemmmmm/thepitremake/enchants/sword/Grasshopper.java @@ -19,36 +19,14 @@ public class Grasshopper extends CustomEnchant { - private EnchantProperty damageAmount = new EnchantProperty<>(0.05f, 0.09f, 0.15f); public BlockUtils blockUtils; @EventHandler public void onHit(EntityDamageByEntityEvent event) { - if (event.getDamager() instanceof Player && event.getEntity() instanceof Player) { - attemptEnchantExecution(((Player) event.getDamager()).getInventory().getItemInHand(), event.getDamager(), event.getEntity(), event); - } } - @SuppressWarnings("deprecation") @Override public void applyEnchant(int level, Object... args) { - Player damager = (Player) args[0]; - Player damaged = (Player) args[1]; - - Block blockDamager = (Block) blockUtils.getBlockUnderPlayer(damager); - Block blockDamaged = (Block) blockUtils.getBlockUnderPlayer(damaged); - if(blockDamager.getType() == Material.GRASS || blockDamaged.getType() == Material.GRASS) { - DamageManager.getInstance().addDamage(((EntityDamageByEntityEvent) args[1]), damageAmount.getValueAtLevel(level), CalculationMode.ADDITIVE); - return; - } - if(blockDamager.getType() == Material.STAINED_CLAY && blockDamager.getData() == 6) { - DamageManager.getInstance().addDamage(((EntityDamageByEntityEvent) args[1]), damageAmount.getValueAtLevel(level), CalculationMode.ADDITIVE); - return; - } - if(blockDamaged.getType() == Material.STAINED_CLAY && blockDamaged.getData() == 6) { - DamageManager.getInstance().addDamage(((EntityDamageByEntityEvent) args[1]), damageAmount.getValueAtLevel(level), CalculationMode.ADDITIVE); - return; - } } @Override