Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-02-04 02:31:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed class-cast for Tectonic

Browse Source 
Fixed misc bugs with Forcefield
use-orb is now enabled by default for Telekinesis
This commit is contained in:
Auxilor 2020-08-30 15:29:14 +01:00
parent 3d0b677501
commit e30ec0dc42
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/Artifact.java
View File

@ -35,7 +35,7 @@ public abstract class Artifact extends EcoEnchant {
}
protected Artifact(String key, double version, Particle particle, Particle.DustOptions extra) {
super(new EcoEnchantBuilder(key, EnchantmentType.ARTIFACT, new Target.Applicable[]{Target.Applicable.ELYTRA, Target.Applicable.SWORD, Target.Applicable.AXE, Target.Applicable.PICKAXE, Target.Applicable.BOW, Target.Applicable.CROSSBOW}, version));
super(new EcoEnchantBuilder(key, EnchantmentType.ARTIFACT, new Target.Applicable[]{Target.Applicable.ELYTRA, Target.Applicable.SWORD, Target.Applicable.AXE, Target.Applicable.PICKAXE, Target.Applicable.BOW, Target.Applicable.CROSSBOW, Target.Applicable.TRIDENT}, version));
this.particle = particle;
this.extra = extra;
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java
View File

@ -30,7 +30,7 @@ public class Forcefield extends EcoEnchant implements EcoRunnable {
for (Entity e : player.getWorld().getNearbyEntities(player.getLocation(), distance, 2.0d, distance)) {
if(!(e instanceof Monster)) continue;
((Monster) e).damage(damage, player);
((Monster) e).damage(damage);
EnchantChecks.getArmorPoints(player, EcoEnchants.FORCEFIELD, 1);
}

1
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tectonic.java
View File

@ -42,6 +42,7 @@ public class Tectonic extends EcoEnchant {
for (Entity entity : entities) {
if (entity.equals(player))
continue;
if(!(entity instanceof LivingEntity)) continue;
entity.teleport(entity.getLocation().add(0, 0.3, 0));
((LivingEntity) entity).damage(damage);
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java
View File

@ -29,7 +29,7 @@ import java.util.List;
public class Telekinesis extends EcoEnchant {
public Telekinesis() {
super(
new EcoEnchantBuilder("telekinesis", EnchantmentType.NORMAL, new Target.Applicable[]{Target.Applicable.TOOL, Target.Applicable.SWORD, Target.Applicable.TRIDENT, Target.Applicable.BOW, Target.Applicable.CROSSBOW}, 4.11)
new EcoEnchantBuilder("telekinesis", EnchantmentType.NORMAL, new Target.Applicable[]{Target.Applicable.TOOL, Target.Applicable.SWORD, Target.Applicable.TRIDENT, Target.Applicable.BOW, Target.Applicable.CROSSBOW}, 4.12)
);
}

4
Plugin/src/main/resources/enchants/normal/telekinesis.yml
View File

@ -2,7 +2,7 @@
# Telekinesis EcoEnchant
#
config-version: 4.11 # Don't edit this.
config-version: 4.12 # Don't edit this.
name: "Telekinesis"
@ -19,5 +19,5 @@ general-config:
conflicts: []
config:
use-orb: false # Use experience orb above player to give xp. Use if you need mending interaction.
use-orb: true # Use experience orb above player to give xp. Use if you need mending interaction.
not-on-players: false # Disallow getting drops from players