diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index cb445bb7f..b5626a307 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; +import kamkeel.npcs.addon.DBCAddon; import kamkeel.npcs.controllers.AttributeController; import kamkeel.npcs.controllers.SyncController; import kamkeel.npcs.util.AttributeAttackUtil; @@ -565,7 +566,7 @@ public class ScriptPlayerEventHandler { boolean cancel = event.isCanceled(); Entity source = NoppesUtilServer.GetDamageSource(event.source); // Player to Player Interaction - if (ConfigMain.AttributesEnabled) { + if (ConfigMain.AttributesEnabled && !DBCAddon.IsAvailable()) { if (event.entityLiving instanceof EntityPlayerMP && source instanceof EntityPlayerMP) { event.ammount = AttributeAttackUtil.calculateDamagePlayerToPlayer((EntityPlayer) source, (EntityPlayer) event.entityLiving, event.ammount); } else if (!(event.entityLiving instanceof EntityNPCInterface) && source instanceof EntityPlayer) {