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

Unsummon siege weapons when exiting siege zone.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-03-28 13:56:58 +00:00
parent fdc8b91095
commit 439dff1703
12 changed files with 175 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}

15
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}

15
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}

15
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}

15
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}

15
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}

15
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import com.l2jmobius.gameserver.model.entity.Fort;
import com.l2jmobius.gameserver.model.entity.FortSiege;
@ -238,6 +239,15 @@ public class SiegeZone extends ZoneType
player.getInventory().unEquipItemInBodySlot(slot);
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
final Summon summon = player.getSummon();
if (summon != null)
{
summon.abortAttack();
summon.abortCast();
summon.stopAllEffects();
summon.unSummon(player);
}
}
@Override

15
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}

15
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}

15
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}

15
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
View File

@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.zone.type;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.enums.MountType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@ -219,6 +220,20 @@ public class SiegeZone extends ZoneType
player.destroyItem("CombatFlag", player.getInventory().getItemByItemId(9819), null, true);
}
}
if (player.hasServitors())
{
player.getServitors().values().forEach(servitor ->
{
if (servitor.getRace() == Race.SIEGE_WEAPON)
{
servitor.abortAttack();
servitor.abortCast();
servitor.stopAllEffects();
servitor.unSummon(player);
}
});
}
}
}