UnsummonServitor action should not work with pets.
Contributed by petryxa.
This commit is contained in:
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class UnsummonServitor implements IPlayerActionHandler
|
|||||||
if (canUnsummon)
|
if (canUnsummon)
|
||||||
{
|
{
|
||||||
final WorldObject target = player.getTarget();
|
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);
|
((Summon) target).unSummon(player);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user