mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-12 08:27:45 +00:00
Rename to AttributeAttackHelper
This commit is contained in:
1 parent
d482213c85
commit
f8b3dcee75
2 files changed
+3
-4
No files matched your search
@@ -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){
|
||||
|
||||
}
|
||||
|
||||
+1
-2
@@ -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){
|
||||
Reference in new issue
Block a user