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

Prohibit breaking summon following owner.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-09-17 07:05:28 +00:00
parent b09d495694
commit d46b12d904
17 changed files with 152 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3413,9 +3413,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3413,9 +3413,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3413,9 +3413,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3413,9 +3413,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3413,9 +3413,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3413,9 +3413,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3413,9 +3413,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+1 -1
View File
@@ -869,7 +869,7 @@ abstract class AbstractAI implements Ctrl
_followTarget = null; _followTarget = null;
} }
protected synchronized Creature getFollowTarget() public synchronized Creature getFollowTarget()
{ {
return _followTarget; return _followTarget;
} }
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -6063,9 +6063,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{ {
if (this instanceof Summon) if (this instanceof Summon)
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getFollowTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+1 -1
View File
@@ -872,7 +872,7 @@ public abstract class AbstractAI implements Ctrl
_followTarget = null; _followTarget = null;
} }
protected Creature getFollowTarget() public Creature getFollowTarget()
{ {
return _followTarget; return _followTarget;
} }
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -4390,9 +4390,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getFollowTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3412,9 +3412,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3412,9 +3412,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3412,9 +3412,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3425,9 +3425,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3425,9 +3425,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+10 -2
View File
@@ -3425,9 +3425,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isSummon()) if (isSummon())
{ {
((Summon) this).setFollowStatus(false); // Do not break following owner.
if (getAI().getTarget() != getActingPlayer())
{
((Summon) this).setFollowStatus(false);
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
else
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
} }
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
return; return;
} }
} }