Make use of onAttack with Skill parameter for some scripts.

Thanks to petryxa.
This commit is contained in:
MobiusDevelopment 2022-12-13 07:20:11 +00:00
parent 3f455121ef
commit 39fce1ade4
41 changed files with 123 additions and 82 deletions

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -173,14 +174,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -210,14 +211,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.ExChangeNpcState; import org.l2jmobius.gameserver.network.serverpackets.ExChangeNpcState;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
@ -166,14 +167,14 @@ public class ClanStrongholdDevice extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000))) if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000)))
{ {
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName())); npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName()));
LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis()); LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis());
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.ExChangeNpcState; import org.l2jmobius.gameserver.network.serverpackets.ExChangeNpcState;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
@ -166,14 +167,14 @@ public class ClanStrongholdDevice extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000))) if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000)))
{ {
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName())); npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName()));
LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis()); LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis());
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.skill.SkillCaster;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
@ -129,7 +130,7 @@ public class FrostLordCastle extends AbstractInstance
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (world == null) if (world == null)
@ -169,7 +170,7 @@ public class FrostLordCastle extends AbstractInstance
} }
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.skill.SkillCaster;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
@ -134,7 +135,7 @@ public class FrostLordCastleHard extends AbstractInstance
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (world == null) if (world == null)
@ -174,7 +175,7 @@ public class FrostLordCastleHard extends AbstractInstance
} }
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.ExChangeNpcState; import org.l2jmobius.gameserver.network.serverpackets.ExChangeNpcState;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
@ -166,14 +167,14 @@ public class ClanStrongholdDevice extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000))) if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000)))
{ {
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName())); npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName()));
LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis()); LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis());
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.skill.SkillCaster;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
@ -129,7 +130,7 @@ public class FrostLordCastle extends AbstractInstance
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (world == null) if (world == null)
@ -169,7 +170,7 @@ public class FrostLordCastle extends AbstractInstance
} }
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.skill.SkillCaster;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
@ -134,7 +135,7 @@ public class FrostLordCastleHard extends AbstractInstance
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (world == null) if (world == null)
@ -174,7 +175,7 @@ public class FrostLordCastleHard extends AbstractInstance
} }
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.skill.SkillCaster;
import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
@ -850,7 +851,7 @@ public class TrainingZone extends AbstractInstance
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if ((world != null) && (world.getRemainingTime() < 600000) && !world.getParameters().getBoolean("spawnedBoss", false)) if ((world != null) && (world.getRemainingTime() < 600000) && !world.getParameters().getBoolean("spawnedBoss", false))
@ -858,7 +859,7 @@ public class TrainingZone extends AbstractInstance
world.getParameters().set("spawnedBoss", true); world.getParameters().set("spawnedBoss", true);
startQuestTimer("SpawnBossClockList", 1000, npc, attacker); startQuestTimer("SpawnBossClockList", 1000, npc, attacker);
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.ExChangeNpcState; import org.l2jmobius.gameserver.network.serverpackets.ExChangeNpcState;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
@ -166,14 +167,14 @@ public class ClanStrongholdDevice extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000))) if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) && (LAST_ATTACK.getOrDefault(npc.getObjectId(), 0L) < (System.currentTimeMillis() - 5000)))
{ {
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName())); npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AT_TACK_SIG_NAL_DE_TEC_TED_S1).addStringParameter(attacker.getName()));
LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis()); LAST_ATTACK.put(npc.getObjectId(), System.currentTimeMillis());
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.item.type.WeaponType;
import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.skill.Skill;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@ -174,14 +175,14 @@ public class SiegeGuards extends AbstractNpcAI
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue())) if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
{ {
((Attackable) npc).stopHating(attacker); ((Attackable) npc).stopHating(attacker);
return null; return null;
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.skill.SkillCaster;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
@ -129,7 +130,7 @@ public class FrostLordCastle extends AbstractInstance
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (world == null) if (world == null)
@ -169,7 +170,7 @@ public class FrostLordCastle extends AbstractInstance
} }
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.skill.SkillCaster;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
@ -134,7 +135,7 @@ public class FrostLordCastleHard extends AbstractInstance
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (world == null) if (world == null)
@ -174,7 +175,7 @@ public class FrostLordCastleHard extends AbstractInstance
} }
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override

View File

@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.skill.SkillCaster;
import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.NpcStringId;
@ -850,7 +851,7 @@ public class TrainingZone extends AbstractInstance
} }
@Override @Override
public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if ((world != null) && (world.getRemainingTime() < 600000) && !world.getParameters().getBoolean("spawnedBoss", false)) if ((world != null) && (world.getRemainingTime() < 600000) && !world.getParameters().getBoolean("spawnedBoss", false))
@ -858,7 +859,7 @@ public class TrainingZone extends AbstractInstance
world.getParameters().set("spawnedBoss", true); world.getParameters().set("spawnedBoss", true);
startQuestTimer("SpawnBossClockList", 1000, npc, attacker); startQuestTimer("SpawnBossClockList", 1000, npc, attacker);
} }
return super.onAttack(npc, attacker, damage, isSummon); return super.onAttack(npc, attacker, damage, isSummon, skill);
} }
@Override @Override