upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 16:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ScriptPlayerEventHandler.java

Browse Source
This commit is contained in:
Kam committed 2025-10-28 00:44:41 -04:00
1 parent 9df3db48ce
commit 557b8720a4
1 file changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
+2 -1
View File
@@ -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) {