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

Summoning should be possible even with an active summon.

Browse Source
This commit is contained in:
MobiusDev
2018-09-12 21:05:18 +00:00
parent 63584d6924
commit f26d8708a9
10 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition; import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
{ {
public CanSummonSkillCondition(StatsSet params) public CanSummonSkillCondition(StatsSet params)
{ {
} }
@Override @Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
if (player.hasServitors()) if (player.hasServitors())
{ {
canSummon = false; for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
} }
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting()) else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{ {

7
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition; import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
{ {
public CanSummonSkillCondition(StatsSet params) public CanSummonSkillCondition(StatsSet params)
{ {
} }
@Override @Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
if (player.hasServitors()) if (player.hasServitors())
{ {
canSummon = false; for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
} }
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting()) else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{ {

7
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition; import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
{ {
public CanSummonSkillCondition(StatsSet params) public CanSummonSkillCondition(StatsSet params)
{ {
} }
@Override @Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
if (player.hasServitors()) if (player.hasServitors())
{ {
canSummon = false; for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
} }
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting()) else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{ {

7
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition; import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
{ {
public CanSummonSkillCondition(StatsSet params) public CanSummonSkillCondition(StatsSet params)
{ {
} }
@Override @Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
if (player.hasServitors()) if (player.hasServitors())
{ {
canSummon = false; for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
} }
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting()) else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{ {

7
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition; import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
{ {
public CanSummonSkillCondition(StatsSet params) public CanSummonSkillCondition(StatsSet params)
{ {
} }
@Override @Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
if (player.hasServitors()) if (player.hasServitors())
{ {
canSummon = false; for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
} }
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting()) else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{ {

7
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition; import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
{ {
public CanSummonSkillCondition(StatsSet params) public CanSummonSkillCondition(StatsSet params)
{ {
} }
@Override @Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
if (player.hasServitors()) if (player.hasServitors())
{ {
canSummon = false; for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
} }
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting()) else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{ {

7
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition; import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
{ {
public CanSummonSkillCondition(StatsSet params) public CanSummonSkillCondition(StatsSet params)
{ {
} }
@Override @Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
if (player.hasServitors()) if (player.hasServitors())
{ {
canSummon = false; for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
} }
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting()) else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{ {

7
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition; import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
{ {
public CanSummonSkillCondition(StatsSet params) public CanSummonSkillCondition(StatsSet params)
{ {
} }
@Override @Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
if (player.hasServitors()) if (player.hasServitors())
{ {
canSummon = false; for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
} }
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting()) else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{ {

7
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition; import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
{ {
public CanSummonSkillCondition(StatsSet params) public CanSummonSkillCondition(StatsSet params)
{ {
} }
@Override @Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
if (player.hasServitors()) if (player.hasServitors())
{ {
canSummon = false; for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
} }
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting()) else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{ {

7
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.ISkillCondition; import com.l2jmobius.gameserver.model.skills.ISkillCondition;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
{ {
public CanSummonSkillCondition(StatsSet params) public CanSummonSkillCondition(StatsSet params)
{ {
} }
@Override @Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
if (player.hasServitors()) if (player.hasServitors())
{ {
canSummon = false; for (L2Summon summon : player.getServitors().values())
{
summon.unSummon(player);
}
} }
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting()) else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{ {