UnsummonServitor action should not work with pets.

Contributed by petryxa.
This commit is contained in:
MobiusDevelopment
2022-10-15 21:11:23 +00:00
parent 52ce1e3676
commit ba0c034869
24 changed files with 24 additions and 24 deletions

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}

View File

@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player) && !target.isPet())
{
((Summon) target).unSummon(player);
}