lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Single target unsummon servitor action.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-06-06 06:00:57 +00:00
parent 381abc4cb2
commit 7445e373d7
15 changed files with 150 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else

11
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.playeractions;
import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
import org.l2jmobius.gameserver.model.ActionDataHolder;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -52,7 +53,15 @@ public class UnsummonServitor implements IPlayerActionHandler
if (canUnsummon)
{
player.getServitors().values().forEach(s -> s.unSummon(player));
final WorldObject target = player.getTarget();
if ((target != null) && target.isSummon() && (((Summon) target).getOwner() == player))
{
((Summon) target).unSummon(player);
}
else
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
}
}
else