diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 0e43eedfa..4b6ffa96a 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -24,7 +24,7 @@ import net.minecraftforge.event.world.BlockEvent; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.attribute.AttributeController; -import noppes.npcs.attribute.DamageCalculator; +import noppes.npcs.attribute.AttributeAttackHelper; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.PartyController; @@ -474,7 +474,7 @@ public class ScriptPlayerEventHandler { if(event.source.getEntity() instanceof EntityPlayer) { if(event.entityLiving instanceof EntityPlayer){ - event.ammount = DamageCalculator.calculateDamagePlayer((EntityPlayer) event.source.getEntity(), (EntityPlayer) event.entityLiving, event.ammount); + event.ammount = AttributeAttackHelper.calculateDamagePlayer((EntityPlayer) event.source.getEntity(), (EntityPlayer) event.entityLiving, event.ammount); } else if (event.entityLiving instanceof EntityNPCInterface){ } diff --git a/src/main/java/noppes/npcs/attribute/DamageCalculator.java b/src/main/java/noppes/npcs/attribute/AttributeAttackHelper.java similarity index 98% rename from src/main/java/noppes/npcs/attribute/DamageCalculator.java rename to src/main/java/noppes/npcs/attribute/AttributeAttackHelper.java index 32d46f07b..a8fa92ccd 100644 --- a/src/main/java/noppes/npcs/attribute/DamageCalculator.java +++ b/src/main/java/noppes/npcs/attribute/AttributeAttackHelper.java @@ -1,6 +1,5 @@ package noppes.npcs.attribute; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.attribute.player.PlayerAttributeTracker; import noppes.npcs.controllers.MagicController; @@ -9,7 +8,7 @@ import noppes.npcs.entity.EntityNPCInterface; import java.util.Map; import java.util.Random; -public class DamageCalculator { +public class AttributeAttackHelper { private static final Random random = new Random(); public static float calculateDamagePlayer(EntityPlayer attacker, EntityPlayer defender, float base){