Dispels should not effect raids.
This commit is contained in:
parent
d0fa47b6c9
commit
3b6f202086
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -62,7 +62,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isDead())
|
if (effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -62,7 +62,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isDead())
|
if (effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -62,7 +62,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isDead())
|
if (effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void onStart(Creature effector, Creature effected, Skill skill)
|
public void onStart(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if ((skill == null) || effected.isDead())
|
if ((skill == null) || effected.isDead() || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (_dispelAbnormals.isEmpty())
|
if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
if (effected == null)
|
if ((effected == null) || effected.isRaid())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
public void instant(Creature effector, Creature effected, Skill skill, Item item)
|
||||||
{
|
{
|
||||||
|
if ((effected == null) || effected.isRaid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
effected.setTarget(null);
|
effected.setTarget(null);
|
||||||
effected.abortAttack();
|
effected.abortAttack();
|
||||||
effected.abortCast();
|
effected.abortCast();
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user