diff --git a/lib/MMOLib.jar b/lib/MMOLib.jar index 04f40974..03c15f60 100644 Binary files a/lib/MMOLib.jar and b/lib/MMOLib.jar differ diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Bouncy_Fireball.java b/src/main/java/net/Indyuce/mmoitems/ability/Bouncy_Fireball.java index e26c8a45..d87cce80 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Bouncy_Fireball.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Bouncy_Fireball.java @@ -82,7 +82,7 @@ public class Bouncy_Fireball extends Ability { for (Entity entity : MMOUtils.getNearbyChunkEntities(loc)) if (entity.getLocation().distanceSquared(loc) < radius * radius) if (MMOUtils.canDamage(stats.getPlayer(), entity)) { - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); ((LivingEntity) entity).setFireTicks((int) (ignite * 20)); } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Burning_Hands.java b/src/main/java/net/Indyuce/mmoitems/ability/Burning_Hands.java index a3b0dfb1..5d8f43f3 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Burning_Hands.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Burning_Hands.java @@ -64,7 +64,7 @@ public class Burning_Hands extends Ability implements Listener { if (j % 5 == 0) for (Entity entity : MMOUtils.getNearbyChunkEntities(loc)) if (entity.getLocation().distanceSquared(loc) < 60 && stats.getPlayer().getEyeLocation().getDirection().angle(entity.getLocation().toVector().subtract(stats.getPlayer().getLocation().toVector())) < Math.PI / 6 && MMOUtils.canDamage(stats.getPlayer(), entity)) - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); } }.runTaskTimer(MMOItems.plugin, 0, 2); diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Contamination.java b/src/main/java/net/Indyuce/mmoitems/ability/Contamination.java index b4f5754c..920fd1b2 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Contamination.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Contamination.java @@ -65,7 +65,7 @@ public class Contamination extends Ability { loc.getWorld().playSound(loc, VersionSound.ENTITY_ENDERMAN_HURT.toSound(), 2, 1); for (Entity entity : MMOUtils.getNearbyChunkEntities(loc)) if (MMOUtils.canDamage(stats.getPlayer(), entity) && entity.getLocation().distanceSquared(loc) <= 25) - MMOLib.plugin.getDamage().damage(stats.getPlayer(), (LivingEntity) entity, new AttackResult(dps, DamageType.SKILL, DamageType.MAGICAL), false); + MMOLib.plugin.getDamage().damage(stats.getPlayer(), (LivingEntity) entity, new AttackResult(dps, DamageType.SKILL, DamageType.MAGIC), false); } } }.runTaskTimer(MMOItems.plugin, 0, 1); diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Corrupt.java b/src/main/java/net/Indyuce/mmoitems/ability/Corrupt.java index 0362b6f8..2e102e36 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Corrupt.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Corrupt.java @@ -57,7 +57,7 @@ public class Corrupt extends Ability { for (Entity entity : MMOUtils.getNearbyChunkEntities(loc)) if (MMOUtils.canDamage(stats.getPlayer(), entity) && entity.getLocation().distanceSquared(loc) <= radius * radius) { - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); ((LivingEntity) entity).removePotionEffect(PotionEffectType.WITHER); ((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.WITHER, (int) (duration * 20), (int) amplifier)); } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Corrupted_Fangs.java b/src/main/java/net/Indyuce/mmoitems/ability/Corrupted_Fangs.java index 1f2fd41c..a4213851 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Corrupted_Fangs.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Corrupted_Fangs.java @@ -71,7 +71,7 @@ public class Corrupted_Fangs extends Ability implements Listener { Object[] data = MMOItems.plugin.getEntities().getEntityData(damager); CachedStats stats = (CachedStats) data[0]; if (MMOUtils.canDamage(stats.getPlayer(), event.getEntity())) - new AttackResult((double) data[1], DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) event.getEntity()); + new AttackResult((double) data[1], DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) event.getEntity()); } } } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Cursed_Beam.java b/src/main/java/net/Indyuce/mmoitems/ability/Cursed_Beam.java index 784072e2..e68aa5ea 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Cursed_Beam.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Cursed_Beam.java @@ -74,7 +74,7 @@ public class Cursed_Beam extends Ability { for (Entity entity : entities) if (MMOUtils.canDamage(stats.getPlayer(), entity) && loc.distanceSquared(entity.getLocation().add(0, 1, 0)) < 9) { - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); ((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, (int) (duration * 20), 0)); } cancel(); diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Earthquake.java b/src/main/java/net/Indyuce/mmoitems/ability/Earthquake.java index d9f821e2..20b7921e 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Earthquake.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Earthquake.java @@ -66,7 +66,7 @@ public class Earthquake extends Ability { for (Entity entity : MMOUtils.getNearbyChunkEntities(loc)) if (MMOUtils.canDamage(stats.getPlayer(), entity) && loc.distanceSquared(entity.getLocation()) < 2 && !hit.contains(entity.getEntityId())) { hit.add(entity.getEntityId()); - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); ((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.SLOW, (int) (slowDuration * 20), (int) slowAmplifier)); } } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Explosive_Turkey.java b/src/main/java/net/Indyuce/mmoitems/ability/Explosive_Turkey.java index f1468b0c..77e8cc63 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Explosive_Turkey.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Explosive_Turkey.java @@ -96,7 +96,7 @@ public class Explosive_Turkey extends Ability implements Listener { chicken.getWorld().playSound(chicken.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 2, 1.5f); for (Entity entity : MMOUtils.getNearbyChunkEntities(chicken.getLocation())) if (!entity.isDead() && entity.getLocation().distanceSquared(chicken.getLocation()) < radiusSquared && MMOUtils.canDamage(stats.getPlayer(), entity)) { - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); entity.setVelocity(entity.getLocation().toVector().subtract(chicken.getLocation().toVector()).multiply(.1 * knockback).setY(.4 * knockback)); } cancel(); diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Fire_Meteor.java b/src/main/java/net/Indyuce/mmoitems/ability/Fire_Meteor.java index 24d7987a..36dd2aef 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Fire_Meteor.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Fire_Meteor.java @@ -65,7 +65,7 @@ public class Fire_Meteor extends Ability { double radius = ability.getModifier("radius"); for (Entity entity : loc.getWorld().getEntitiesByClass(LivingEntity.class)) if (MMOUtils.canDamage(stats.getPlayer(), entity) && entity.getLocation().distanceSquared(loc) < radius * radius) { - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); entity.setVelocity(entity.getLocation().toVector().subtract(loc.toVector()).multiply(.1 * knockback).setY(.4 * knockback)); } cancel(); diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Firebolt.java b/src/main/java/net/Indyuce/mmoitems/ability/Firebolt.java index 20406e47..f462de8e 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Firebolt.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Firebolt.java @@ -67,7 +67,7 @@ public class Firebolt extends Ability { loc.getWorld().spawnParticle(Particle.LAVA, loc, 8, 0, 0, 0, 0); loc.getWorld().spawnParticle(Particle.EXPLOSION_LARGE, loc, 0); loc.getWorld().playSound(loc, Sound.ENTITY_GENERIC_EXPLODE, 3, 1); - new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGICAL, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) target); + new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGIC, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) target); target.setFireTicks((int) ability.getModifier("ignite") * 20); cancel(); return; diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Firefly.java b/src/main/java/net/Indyuce/mmoitems/ability/Firefly.java index af987c1f..1371ce5c 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Firefly.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Firefly.java @@ -70,7 +70,7 @@ public class Firefly extends Ability { stats.getPlayer().getWorld().spawnParticle(Particle.FLAME, stats.getPlayer().getLocation().add(0, 1, 0), 24, 0, 0, 0, .3); entity.setVelocity(stats.getPlayer().getVelocity().setY(0.3).multiply(1.7 * knockback)); stats.getPlayer().setVelocity(stats.getPlayer().getEyeLocation().getDirection().multiply(-3).setY(.5)); - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); cancel(); return; } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Freezing_Curse.java b/src/main/java/net/Indyuce/mmoitems/ability/Freezing_Curse.java index a2cfe005..d6f00236 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Freezing_Curse.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Freezing_Curse.java @@ -73,7 +73,7 @@ public class Freezing_Curse extends Ability { double damage = ability.getModifier("damage"); for (Entity entity : MMOUtils.getNearbyChunkEntities(loc)) if (entity.getLocation().distanceSquared(loc) < radius * radius && MMOUtils.canDamage(stats.getPlayer(), entity)) { - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); ((LivingEntity) entity).removePotionEffect(PotionEffectType.SLOW); ((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.SLOW, (int) (duration * 20), (int) amplifier)); } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Holy_Missile.java b/src/main/java/net/Indyuce/mmoitems/ability/Holy_Missile.java index 58d36549..d2000456 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Holy_Missile.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Holy_Missile.java @@ -71,7 +71,7 @@ public class Holy_Missile extends Ability { loc.getWorld().spawnParticle(Particle.EXPLOSION_LARGE, loc, 1); loc.getWorld().spawnParticle(Particle.FIREWORKS_SPARK, loc, 32, 0, 0, 0, .2); loc.getWorld().playSound(loc, Sound.ENTITY_GENERIC_EXPLODE, 2, 1); - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); cancel(); return; } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Ice_Crystal.java b/src/main/java/net/Indyuce/mmoitems/ability/Ice_Crystal.java index d464de35..2bc3179a 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Ice_Crystal.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Ice_Crystal.java @@ -81,7 +81,7 @@ public class Ice_Crystal extends Ability { loc.getWorld().spawnParticle(Particle.EXPLOSION_LARGE, loc, 0); loc.getWorld().spawnParticle(Particle.FIREWORKS_SPARK, loc, 48, 0, 0, 0, .2); loc.getWorld().playSound(loc, Sound.ENTITY_GENERIC_EXPLODE, 2, 1); - new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGICAL, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGIC, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); ((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.SLOW, (int) (ability.getModifier("duration") * 20), (int) ability.getModifier("amplifier"))); cancel(); return; diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Life_Ender.java b/src/main/java/net/Indyuce/mmoitems/ability/Life_Ender.java index 502c8e33..b69e95bb 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Life_Ender.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Life_Ender.java @@ -72,7 +72,7 @@ public class Life_Ender extends Ability { for (Entity entity : MMOUtils.getNearbyChunkEntities(source)) if (entity.getLocation().distanceSquared(source) < radius * radius && MMOUtils.canDamage(stats.getPlayer(), entity)) { - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); entity.setVelocity(entity.getLocation().subtract(source).toVector().setY(.75).normalize().multiply(knockback)); } cancel(); diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Lightning_Beam.java b/src/main/java/net/Indyuce/mmoitems/ability/Lightning_Beam.java index b1ec4d7d..bed66a43 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Lightning_Beam.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Lightning_Beam.java @@ -41,7 +41,7 @@ public class Lightning_Beam extends Ability { for (Entity entity : MMOUtils.getNearbyChunkEntities(loc)) if (MMOUtils.canDamage(stats.getPlayer(), entity) && entity.getLocation().distanceSquared(loc) <= radius * radius) - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); stats.getPlayer().getWorld().playSound(stats.getPlayer().getLocation(), VersionSound.ENTITY_FIREWORK_ROCKET_BLAST.toSound(), 1, 0); loc.getWorld().spawnParticle(Particle.FIREWORKS_SPARK, loc, 64, 0, 0, 0, .2); diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Magma_Fissure.java b/src/main/java/net/Indyuce/mmoitems/ability/Magma_Fissure.java index 6986608e..e9912b59 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Magma_Fissure.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Magma_Fissure.java @@ -60,7 +60,7 @@ public class Magma_Fissure extends Ability { if (target.getLocation().distanceSquared(loc) < 1) { loc.getWorld().playSound(loc, Sound.ENTITY_BLAZE_HURT, 2, 1); target.setFireTicks((int) (target.getFireTicks() + ability.getModifier("ignite") * 20)); - new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), target); + new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), target); cancel(); } } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Overload.java b/src/main/java/net/Indyuce/mmoitems/ability/Overload.java index 42ab6492..b38584bb 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Overload.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Overload.java @@ -46,7 +46,7 @@ public class Overload extends Ability { for (Entity entity : stats.getPlayer().getNearbyEntities(radius, radius, radius)) if (MMOUtils.canDamage(stats.getPlayer(), entity)) - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); double step = 12 + (radius * 2.5); for (double j = 0; j < Math.PI * 2; j += Math.PI / step) { diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Present_Throw.java b/src/main/java/net/Indyuce/mmoitems/ability/Present_Throw.java index 6f0cf68f..3e0ecc4d 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Present_Throw.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Present_Throw.java @@ -97,7 +97,7 @@ public class Present_Throw extends Ability { item.getEntity().getWorld().playSound(item.getEntity().getLocation(), VersionSound.ENTITY_FIREWORK_ROCKET_TWINKLE.toSound(), 2, 1.5f); for (Entity entity : MMOUtils.getNearbyChunkEntities(item.getEntity().getLocation())) if (entity.getLocation().distanceSquared(item.getEntity().getLocation()) < radiusSquared && MMOUtils.canDamage(stats.getPlayer(), entity)) - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC, DamageType.PROJECTILE).damage(stats.getPlayer(), (LivingEntity) entity); item.close(); cancel(); } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Shulker_Missile.java b/src/main/java/net/Indyuce/mmoitems/ability/Shulker_Missile.java index f36cfa3d..eeb39cc1 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Shulker_Missile.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Shulker_Missile.java @@ -62,7 +62,7 @@ public class Shulker_Missile extends Ability implements Listener { stats.getPlayer().getWorld().playSound(stats.getPlayer().getLocation(), Sound.ENTITY_WITHER_SHOOT, 2, 2); ShulkerBullet shulkerBullet = (ShulkerBullet) stats.getPlayer().getWorld().spawnEntity(stats.getPlayer().getLocation().add(0, 1, 0), EntityType.SHULKER_BULLET); shulkerBullet.setShooter(stats.getPlayer()); - MMOItems.plugin.getEntities().registerCustomEntity(shulkerBullet, new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGICAL, DamageType.PROJECTILE), ability.getModifier("effect-duration")); + MMOItems.plugin.getEntities().registerCustomEntity(shulkerBullet, new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGIC, DamageType.PROJECTILE), ability.getModifier("effect-duration")); new BukkitRunnable() { double ti = 0; diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Smite.java b/src/main/java/net/Indyuce/mmoitems/ability/Smite.java index a1c7b37d..6e021ebd 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Smite.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Smite.java @@ -29,7 +29,7 @@ public class Smite extends Ability { @Override public void whenCast(CachedStats stats, AbilityResult ability, ItemAttackResult result) { LivingEntity target = ((TargetAbilityResult) ability).getTarget(); - new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), target); + new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), target); target.getWorld().strikeLightningEffect(target.getLocation()); } } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Sparkle.java b/src/main/java/net/Indyuce/mmoitems/ability/Sparkle.java index 7a8993f9..ef69f2db 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Sparkle.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Sparkle.java @@ -41,7 +41,7 @@ public class Sparkle extends Ability { double radius = ability.getModifier("radius"); double limit = ability.getModifier("limit"); - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), target); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), target); target.getWorld().spawnParticle(Particle.EXPLOSION_LARGE, target.getLocation().add(0, 1, 0), 0); target.getWorld().playSound(target.getLocation(), VersionSound.ENTITY_FIREWORK_ROCKET_TWINKLE.toSound(), 2, 2); @@ -49,7 +49,7 @@ public class Sparkle extends Ability { for (Entity entity : target.getNearbyEntities(radius, radius, radius)) if (count < limit && entity instanceof LivingEntity && entity != stats.getPlayer() && !(entity instanceof ArmorStand)) { count++; - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); entity.getWorld().playSound(entity.getLocation(), VersionSound.ENTITY_FIREWORK_ROCKET_TWINKLE.toSound(), 2, 2); Location loc_t = target.getLocation().add(0, .75, 0); Location loc_ent = entity.getLocation().add(0, .75, 0); diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Tactical_Grenade.java b/src/main/java/net/Indyuce/mmoitems/ability/Tactical_Grenade.java index f8a2c711..22ae099f 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Tactical_Grenade.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Tactical_Grenade.java @@ -76,7 +76,7 @@ public class Tactical_Grenade extends Ability { if (entity.equals(target)) cancel(); - new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); entity.setVelocity(entity.getVelocity().add(offsetVector(knockup))); } } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/Targeted_Fireball.java b/src/main/java/net/Indyuce/mmoitems/ability/Targeted_Fireball.java index 3637e5cb..d68fcac3 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/Targeted_Fireball.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/Targeted_Fireball.java @@ -65,7 +65,7 @@ public class Targeted_Fireball extends Ability { loc.getWorld().spawnParticle(Particle.FLAME, loc, 32, 0, 0, 0, .1); loc.getWorld().playSound(loc, Sound.ENTITY_BLAZE_HURT, 2, 1); target.setFireTicks((int) (target.getFireTicks() + ability.getModifier("ignite") * 20)); - new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGICAL, DamageType.PROJECTILE).damage(stats.getPlayer(), target); + new AttackResult(ability.getModifier("damage"), DamageType.SKILL, DamageType.MAGIC, DamageType.PROJECTILE).damage(stats.getPlayer(), target); cancel(); } } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/arcane/Arcane_Hail.java b/src/main/java/net/Indyuce/mmoitems/ability/arcane/Arcane_Hail.java index 4c88d91f..417d4bdb 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/arcane/Arcane_Hail.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/arcane/Arcane_Hail.java @@ -58,7 +58,7 @@ public class Arcane_Hail extends Ability { loc1.getWorld().playSound(loc1, VersionSound.ENTITY_ENDERMAN_HURT.toSound(), 1, 0); for (Entity entity : MMOUtils.getNearbyChunkEntities(loc1)) if (MMOUtils.canDamage(stats.getPlayer(), entity) && entity.getLocation().distanceSquared(loc1) <= 4) - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); loc1.getWorld().spawnParticle(Particle.SPELL_WITCH, loc1, 12, 0, 0, 0, .1); loc1.getWorld().spawnParticle(Particle.SMOKE_NORMAL, loc1, 6, 0, 0, 0, .1); diff --git a/src/main/java/net/Indyuce/mmoitems/ability/arcane/Arcane_Rift.java b/src/main/java/net/Indyuce/mmoitems/ability/arcane/Arcane_Rift.java index 2f91cc33..f9d27bf4 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/arcane/Arcane_Rift.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/arcane/Arcane_Rift.java @@ -69,7 +69,7 @@ public class Arcane_Rift extends Ability { for (Entity entity : MMOUtils.getNearbyChunkEntities(loc)) if (MMOUtils.canDamage(stats.getPlayer(), entity) && loc.distanceSquared(entity.getLocation()) < 2 && !hit.contains(entity.getEntityId())) { hit.add(entity.getEntityId()); - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); ((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.SLOW, (int) (slowDuration * 20), (int) slowAmplifier)); } } diff --git a/src/main/java/net/Indyuce/mmoitems/ability/onhit/Death_Mark.java b/src/main/java/net/Indyuce/mmoitems/ability/onhit/Death_Mark.java index 36cf24f4..c04d1ba6 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/onhit/Death_Mark.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/onhit/Death_Mark.java @@ -55,7 +55,7 @@ public class Death_Mark extends Ability { target.getWorld().spawnParticle(Particle.SPELL_MOB, target.getLocation(), 4, .2, 0, .2, 0); if (ti % 20 == 0) - MMOLib.plugin.getDamage().damage(stats.getPlayer(), target, new AttackResult(dps, DamageType.SKILL, DamageType.MAGICAL), false); + MMOLib.plugin.getDamage().damage(stats.getPlayer(), target, new AttackResult(dps, DamageType.SKILL, DamageType.MAGIC), false); } }.runTaskTimer(MMOItems.plugin, 0, 1); target.getWorld().playSound(target.getLocation(), Sound.ENTITY_BLAZE_HURT, 1, 2); diff --git a/src/main/java/net/Indyuce/mmoitems/ability/onhit/Minor_Explosion.java b/src/main/java/net/Indyuce/mmoitems/ability/onhit/Minor_Explosion.java index f5bac307..32e7e712 100644 --- a/src/main/java/net/Indyuce/mmoitems/ability/onhit/Minor_Explosion.java +++ b/src/main/java/net/Indyuce/mmoitems/ability/onhit/Minor_Explosion.java @@ -47,7 +47,7 @@ public class Minor_Explosion extends Ability { for (Entity entity : MMOUtils.getNearbyChunkEntities(loc)) if (entity.getLocation().distanceSquared(loc) < radiusSquared && MMOUtils.canDamage(stats.getPlayer(), entity)) { - new AttackResult(damage, DamageType.SKILL, DamageType.MAGICAL).damage(stats.getPlayer(), (LivingEntity) entity); + new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC).damage(stats.getPlayer(), (LivingEntity) entity); entity.setVelocity(MMOUtils.normalize(entity.getLocation().subtract(loc).toVector().setY(0)).setY(.2).multiply(2 * knockback)); } } diff --git a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/Lute.java b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/Lute.java index 163ce098..f7ac4e4a 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/Lute.java +++ b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/Lute.java @@ -69,7 +69,7 @@ public class Lute extends UntargetedWeapon { for (Entity target : entities) if (MMOUtils.canDamage(getPlayer(), loc, target)) { - new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGICAL).applyEffectsAndDamage(stats, getNBTItem(), (LivingEntity) target); + new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGIC).applyEffectsAndDamage(stats, getNBTItem(), (LivingEntity) target); cancel(); return; } diff --git a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/Staff.java b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/Staff.java index 9469b274..5b37b6c9 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/Staff.java +++ b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/Staff.java @@ -48,7 +48,7 @@ public class Staff extends UntargetedWeapon { MMORayTraceResult trace = MMOLib.plugin.getVersion().getWrapper().rayTrace(stats.getPlayer(), range, entity -> MMOUtils.canDamage(stats.getPlayer(), entity)); if (trace.hasHit()) - new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGICAL).applyEffectsAndDamage(stats, getNBTItem(), trace.getHit()); + new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGIC).applyEffectsAndDamage(stats, getNBTItem(), trace.getHit()); trace.draw(loc, getPlayer().getEyeLocation().getDirection(), 2, (tick) -> tick.getWorld().spawnParticle(Particle.EXPLOSION_NORMAL, tick, 0, .1, .1, .1, 0)); getPlayer().getWorld().playSound(getPlayer().getLocation(), VersionSound.ENTITY_FIREWORK_ROCKET_TWINKLE.toSound(), 2, 2); } diff --git a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/LightningSpirit.java b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/LightningSpirit.java index fc226ce2..ce3fc3a6 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/LightningSpirit.java +++ b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/LightningSpirit.java @@ -28,7 +28,7 @@ public class LightningSpirit implements StaffAttackHandler { loc.getWorld().spawnParticle(Particle.FIREWORKS_SPARK, loc, 0); for (Entity target : MMOUtils.getNearbyChunkEntities(loc)) if (MMOUtils.canDamage(stats.getPlayer(), loc, target)) { - new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGICAL).applyEffectsAndDamage(stats, nbt, (LivingEntity) target); + new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGIC).applyEffectsAndDamage(stats, nbt, (LivingEntity) target); loc.getWorld().spawnParticle(Particle.EXPLOSION_NORMAL, loc, 16, 0, 0, 0, .1); return; } diff --git a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/ManaSpirit.java b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/ManaSpirit.java index c5555982..e14c050b 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/ManaSpirit.java +++ b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/ManaSpirit.java @@ -51,7 +51,7 @@ public class ManaSpirit implements StaffAttackHandler { } for (Entity target : targets) if (MMOUtils.canDamage(stats.getPlayer(), loc, target)) { - new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGICAL).applyEffectsAndDamage(stats, nbt, (LivingEntity) target); + new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGIC).applyEffectsAndDamage(stats, nbt, (LivingEntity) target); loc.getWorld().spawnParticle(Particle.EXPLOSION_LARGE, loc, 0); cancel(); return; diff --git a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/NetherSpirit.java b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/NetherSpirit.java index 275d80f4..495b4ce3 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/NetherSpirit.java +++ b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/NetherSpirit.java @@ -42,7 +42,7 @@ public class NetherSpirit implements StaffAttackHandler { loc.getWorld().spawnParticle(Particle.SMOKE_NORMAL, loc, 0); for (Entity target : targets) if (MMOUtils.canDamage(stats.getPlayer(), loc, target)) { - new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGICAL).applyEffectsAndDamage(stats, nbt, (LivingEntity) target); + new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGIC).applyEffectsAndDamage(stats, nbt, (LivingEntity) target); loc.getWorld().spawnParticle(Particle.EXPLOSION_LARGE, loc, 0); cancel(); return; diff --git a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/SunfireSpirit.java b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/SunfireSpirit.java index 130f0399..f79c6cbf 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/SunfireSpirit.java +++ b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/SunfireSpirit.java @@ -44,7 +44,7 @@ public class SunfireSpirit implements StaffAttackHandler { loc.getWorld().playSound(loc, VersionSound.ENTITY_FIREWORK_ROCKET_BLAST.toSound(), 2, 2); for (Entity target : MMOUtils.getNearbyChunkEntities(loc)) if (MMOUtils.canDamage(stats.getPlayer(), target) && target.getLocation().distanceSquared(loc) <= 9) - new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGICAL).applyEffectsAndDamage(stats, nbt, (LivingEntity) target); + new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGIC).applyEffectsAndDamage(stats, nbt, (LivingEntity) target); cancel(); break; } diff --git a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/ThunderSpirit.java b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/ThunderSpirit.java index 6959ef9c..55d1626c 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/ThunderSpirit.java +++ b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/ThunderSpirit.java @@ -42,7 +42,7 @@ public class ThunderSpirit implements StaffAttackHandler { loc.getWorld().playSound(loc, VersionSound.ENTITY_FIREWORK_ROCKET_BLAST.toSound(), 2, 2); for (Entity target : MMOUtils.getNearbyChunkEntities(loc)) if (MMOUtils.canDamage(stats.getPlayer(), target) && target.getLocation().distanceSquared(loc) <= 9) - new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGICAL).applyEffectsAndDamage(stats, nbt, (LivingEntity) target); + new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGIC).applyEffectsAndDamage(stats, nbt, (LivingEntity) target); cancel(); } } diff --git a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/VoidSpirit.java b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/VoidSpirit.java index 2e0cde72..8b2a794e 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/VoidSpirit.java +++ b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/VoidSpirit.java @@ -32,6 +32,6 @@ public class VoidSpirit implements StaffAttackHandler { shulkerBullet.setVelocity(vec); } }.runTaskTimer(MMOItems.plugin, 0, 1); - MMOItems.plugin.getEntities().registerCustomEntity(shulkerBullet, new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.MAGICAL, DamageType.PROJECTILE), 0., stats, nbt); + MMOItems.plugin.getEntities().registerCustomEntity(shulkerBullet, new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.MAGIC, DamageType.PROJECTILE), 0., stats, nbt); } } diff --git a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/XRaySpirit.java b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/XRaySpirit.java index bfc97ef0..c224641c 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/XRaySpirit.java +++ b/src/main/java/net/Indyuce/mmoitems/api/interaction/weapon/untargeted/staff/XRaySpirit.java @@ -24,7 +24,7 @@ public class XRaySpirit implements StaffAttackHandler { MMORayTraceResult trace = MMOLib.plugin.getVersion().getWrapper().rayTrace(stats.getPlayer(), range, entity -> MMOUtils.canDamage(stats.getPlayer(), entity)); if (trace.hasHit()) - new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGICAL).applyEffectsAndDamage(stats, nbt, trace.getHit()); + new ItemAttackResult(attackDamage, DamageType.WEAPON, DamageType.PROJECTILE, DamageType.MAGIC).applyEffectsAndDamage(stats, nbt, trace.getHit()); trace.draw(loc, stats.getPlayer().getEyeLocation().getDirection(), 2, Color.BLACK); stats.getPlayer().getWorld().playSound(stats.getPlayer().getLocation(), Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR, 0.40f, 2); } diff --git a/src/main/java/net/Indyuce/mmoitems/comp/rpg/HeroesHook.java b/src/main/java/net/Indyuce/mmoitems/comp/rpg/HeroesHook.java index f4ade730..f1b4ffd2 100644 --- a/src/main/java/net/Indyuce/mmoitems/comp/rpg/HeroesHook.java +++ b/src/main/java/net/Indyuce/mmoitems/comp/rpg/HeroesHook.java @@ -34,7 +34,7 @@ public class HeroesHook implements RPGHandler, Listener, DamageHandler { MMOLib.plugin.getDamage().registerHandler(this); damages.put(SkillType.ABILITY_PROPERTY_PHYSICAL, DamageType.PHYSICAL); - damages.put(SkillType.ABILITY_PROPERTY_MAGICAL, DamageType.MAGICAL); + damages.put(SkillType.ABILITY_PROPERTY_MAGICAL, DamageType.MAGIC); damages.put(SkillType.ABILITY_PROPERTY_PROJECTILE, DamageType.PROJECTILE); } @@ -79,7 +79,7 @@ public class HeroesHook implements RPGHandler, Listener, DamageHandler { */ if (event.getSkill().isType(SkillType.ABILITY_PROPERTY_MAGICAL)) { if (event.getDamager().getEntity() instanceof Player) - event.setDamage(event.getDamage() * (1 + PlayerData.get((Player) event.getDamager().getEntity()).getStats().getStat(ItemStat.MAGICAL_DAMAGE) / 100)); + event.setDamage(event.getDamage() * (1 + PlayerData.get((Player) event.getDamager().getEntity()).getStats().getStat(ItemStat.MAGIC_DAMAGE) / 100)); if (event.getEntity() instanceof Player) event.setDamage(event.getDamage() * (1 - PlayerData.get((Player) event.getDamager().getEntity()).getStats().getStat(ItemStat.MAGIC_DAMAGE_REDUCTION) / 100)); } diff --git a/src/main/java/net/Indyuce/mmoitems/comp/rpg/SkillAPIHook.java b/src/main/java/net/Indyuce/mmoitems/comp/rpg/SkillAPIHook.java index abdab332..67148c8b 100644 --- a/src/main/java/net/Indyuce/mmoitems/comp/rpg/SkillAPIHook.java +++ b/src/main/java/net/Indyuce/mmoitems/comp/rpg/SkillAPIHook.java @@ -28,7 +28,7 @@ public class SkillAPIHook implements RPGHandler, Listener { public void a(SkillDamageEvent event) { if (event.getDamager() instanceof Player) - event.setDamage(event.getDamage() * (1 + net.Indyuce.mmoitems.api.player.PlayerData.get((Player) event.getDamager()).getStats().getStat(ItemStat.MAGICAL_DAMAGE) / 100)); + event.setDamage(event.getDamage() * (1 + net.Indyuce.mmoitems.api.player.PlayerData.get((Player) event.getDamager()).getStats().getStat(ItemStat.MAGIC_DAMAGE) / 100)); if (event.getTarget() instanceof Player) event.setDamage(event.getDamage() * (1 - net.Indyuce.mmoitems.api.player.PlayerData.get((Player) event.getTarget()).getStats().getStat(ItemStat.MAGIC_DAMAGE_REDUCTION) / 100)); diff --git a/src/main/java/net/Indyuce/mmoitems/stat/type/ItemStat.java b/src/main/java/net/Indyuce/mmoitems/stat/type/ItemStat.java index bc58510f..cc83b809 100644 --- a/src/main/java/net/Indyuce/mmoitems/stat/type/ItemStat.java +++ b/src/main/java/net/Indyuce/mmoitems/stat/type/ItemStat.java @@ -111,7 +111,7 @@ public abstract class ItemStat { public static final ItemStat WEAPON_DAMAGE = new DoubleStat(new ItemStack(Material.IRON_SWORD), "Weapon Damage", new String[] { "Additional on-hit weapon damage in %." }, "weapon-damage"); public static final ItemStat SKILL_DAMAGE = new DoubleStat(new ItemStack(Material.BOOK), "Skill Damage", new String[] { "Additional ability damage in %." }, "skill-damage"); public static final ItemStat PROJECTILE_DAMAGE = new DoubleStat(new ItemStack(Material.ARROW), "Projectile Damage", new String[] { "Additional skill/weapon projectile damage." }, "projectile-damage"); - public static final ItemStat MAGICAL_DAMAGE = new DoubleStat(new ItemStack(Material.BOOK), "Magical Damage", new String[] { "Additional magical skill damage in %." }, "magical-damage"); + public static final ItemStat MAGIC_DAMAGE = new DoubleStat(new ItemStack(Material.BOOK), "Magic Damage", new String[] { "Additional magic skill damage in %." }, "magic-damage"); public static final ItemStat PHYSICAL_DAMAGE = new DoubleStat(new ItemStack(Material.IRON_AXE), "Physical Damage", new String[] { "Additional skill/weapon physical damage." }, "physical-damage"); public static final ItemStat DAMAGE_REDUCTION = new DoubleStat(new ItemStack(Material.IRON_CHESTPLATE), "Damage Reduction", new String[] { "Reduces damage from any source.", "In %." }, "damage-reduction"); public static final ItemStat FALL_DAMAGE_REDUCTION = new DoubleStat(new ItemStack(Material.FEATHER), "Fall Damage Reduction", new String[] { "Reduces fall damage.", "In %." }, "fall-damage-reduction");