Exclude invulnerable NPCs from auto play targeting.

This commit is contained in:
MobiusDevelopment 2024-12-07 20:43:39 +02:00
parent ce4fbaa8ef
commit 8c71d83be1
33 changed files with 165 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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