Check if OnCreatureSkillFinishCast target is null.
This commit is contained in:
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
@@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
|
|
||||||
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
|
||||||
{
|
{
|
||||||
if (!event.getTarget().isCreature())
|
if (_castSkillId != event.getSkill().getId())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_castSkillId != event.getSkill().getId())
|
WorldObject target = event.getTarget();
|
||||||
|
if (target == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!target.isCreature())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldObject target = null;
|
target = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
|
||||||
|
Reference in New Issue
Block a user