Prohibit auto casting SUMMON TargetType when all summons are affected.
Contributed by Index.
This commit is contained in:
@@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable
|
|||||||
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
||||||
{
|
{
|
||||||
// Summon check.
|
// Summon check.
|
||||||
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
|
if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON))
|
||||||
{
|
{
|
||||||
if (!player.hasServitors())
|
if (!player.hasServitors())
|
||||||
{
|
{
|
||||||
|
@@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable
|
|||||||
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
||||||
{
|
{
|
||||||
// Summon check.
|
// Summon check.
|
||||||
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
|
if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON))
|
||||||
{
|
{
|
||||||
if (!player.hasServitors())
|
if (!player.hasServitors())
|
||||||
{
|
{
|
||||||
|
@@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable
|
|||||||
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
||||||
{
|
{
|
||||||
// Summon check.
|
// Summon check.
|
||||||
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
|
if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON))
|
||||||
{
|
{
|
||||||
if (!player.hasServitors())
|
if (!player.hasServitors())
|
||||||
{
|
{
|
||||||
|
@@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable
|
|||||||
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
||||||
{
|
{
|
||||||
// Summon check.
|
// Summon check.
|
||||||
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
|
if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON))
|
||||||
{
|
{
|
||||||
if (!player.hasServitors())
|
if (!player.hasServitors())
|
||||||
{
|
{
|
||||||
|
@@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable
|
|||||||
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
||||||
{
|
{
|
||||||
// Summon check.
|
// Summon check.
|
||||||
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
|
if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON))
|
||||||
{
|
{
|
||||||
if (!player.hasServitors())
|
if (!player.hasServitors())
|
||||||
{
|
{
|
||||||
|
@@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable
|
|||||||
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
||||||
{
|
{
|
||||||
// Summon check.
|
// Summon check.
|
||||||
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
|
if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON))
|
||||||
{
|
{
|
||||||
if (!player.hasServitors())
|
if (!player.hasServitors())
|
||||||
{
|
{
|
||||||
|
@@ -390,7 +390,7 @@ public class AutoUseTaskManager implements Runnable
|
|||||||
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
||||||
{
|
{
|
||||||
// Summon check.
|
// Summon check.
|
||||||
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
|
if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON))
|
||||||
{
|
{
|
||||||
if (!player.hasServitors())
|
if (!player.hasServitors())
|
||||||
{
|
{
|
||||||
|
@@ -390,7 +390,7 @@ public class AutoUseTaskManager implements Runnable
|
|||||||
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
||||||
{
|
{
|
||||||
// Summon check.
|
// Summon check.
|
||||||
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
|
if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON))
|
||||||
{
|
{
|
||||||
if (!player.hasServitors())
|
if (!player.hasServitors())
|
||||||
{
|
{
|
||||||
|
@@ -390,7 +390,7 @@ public class AutoUseTaskManager implements Runnable
|
|||||||
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
||||||
{
|
{
|
||||||
// Summon check.
|
// Summon check.
|
||||||
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
|
if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON))
|
||||||
{
|
{
|
||||||
if (!player.hasServitors())
|
if (!player.hasServitors())
|
||||||
{
|
{
|
||||||
|
@@ -390,7 +390,7 @@ public class AutoUseTaskManager implements Runnable
|
|||||||
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
private boolean canCastBuff(Player player, WorldObject target, Skill skill)
|
||||||
{
|
{
|
||||||
// Summon check.
|
// Summon check.
|
||||||
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
|
if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON))
|
||||||
{
|
{
|
||||||
if (!player.hasServitors())
|
if (!player.hasServitors())
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user