enabled enchant

Transhacks · Apr 20, 2024 · 7c142c1 · 7c142c1
1 parent 56b33a8
commit 7c142c1
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 28 deletions.
diff --git a/src/me/stevemmmmm/thepitremake/enchants/bow/DevilChicks.java b/src/me/stevemmmmm/thepitremake/enchants/bow/DevilChicks.java
@@ -122,7 +122,7 @@ public ArrayList<String> 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
@@ -105,7 +105,7 @@ public ArrayList<String> 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
@@ -53,7 +53,7 @@ public ArrayList<String> 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
@@ -165,7 +165,7 @@ public ArrayList<String> 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
@@ -103,7 +103,7 @@ public ArrayList<String> 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
@@ -90,7 +90,7 @@ public ArrayList<String> 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
@@ -19,36 +19,14 @@
 
 public class Grasshopper extends CustomEnchant {
 
-	private EnchantProperty<Float> 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