Exclude invulnerable NPCs from auto play targeting.
This commit is contained in:
parent
ce4fbaa8ef
commit
8c71d83be1
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -296,6 +296,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -296,6 +296,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -296,6 +296,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -296,6 +296,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -296,6 +296,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -296,6 +296,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -296,6 +296,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -312,6 +312,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -312,6 +312,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -312,6 +312,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -318,6 +318,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -318,6 +318,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -317,6 +317,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -336,6 +336,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -336,6 +336,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -336,6 +336,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -336,6 +336,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -336,6 +336,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
@ -336,6 +336,11 @@ public class AutoPlayTaskManager
|
|||||||
|
|
||||||
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
private boolean isTargetModeValid(int mode, Player player, Creature creature)
|
||||||
{
|
{
|
||||||
|
if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul()))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case 1: // Monster
|
case 1: // Monster
|
||||||
|
Loading…
Reference in New Issue
Block a user