diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java index a551f9d2ac..062fd3944e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.ai.SummonAI; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; -import org.l2jmobius.gameserver.data.xml.PetAcquireList; -import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.NpcInfoType; import org.l2jmobius.gameserver.enums.Race; @@ -133,24 +131,22 @@ public abstract class Summon extends Playable setFollowStatus(true); updateAndBroadcastStatus(0); - if (isPet()) - { - final Pet pet = (Pet) this; - final int specialSkillId = PetAcquireList.getInstance().getSpecialSkillByType(pet.getPetData().getType()); - addSkill(SkillData.getInstance().getSkill(specialSkillId, pet.getEvolveLevel() + 1)); - } if (_owner != null) { - sendPacket(new PetInfo(this, 1)); - sendPacket(new ExPetSkillList(true, this)); - if (getInventory() != null) + if (isPet()) { - sendPacket(new PetItemList(getInventory().getItems())); + sendPacket(new PetInfo(this, 1)); + sendPacket(new ExPetSkillList(true, (Pet) this)); + if (getInventory() != null) + { + sendPacket(new PetItemList(getInventory().getItems())); + } } sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); + World.getInstance().forEachVisibleObject(getOwner(), Player.class, player -> player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player)))); } - World.getInstance().forEachVisibleObject(getOwner(), Player.class, player -> player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player)))); + final Party party = _owner.getParty(); if (party != null) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java index ff1d0e43e2..e854fca7ed 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pet; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExPetSkillList implements IClientOutgoingPacket { private final boolean _onEnter; - private final Summon _pet; + private final Pet _pet; - public ExPetSkillList(boolean onEnter, Summon pet) + public ExPetSkillList(boolean onEnter, Pet pet) { _onEnter = onEnter; _pet = pet; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java index b7de14717e..6f6c388c3b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.ai.SummonAI; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; -import org.l2jmobius.gameserver.data.xml.PetAcquireList; -import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.NpcInfoType; import org.l2jmobius.gameserver.enums.Race; @@ -133,24 +131,22 @@ public abstract class Summon extends Playable setFollowStatus(true); updateAndBroadcastStatus(0); - if (isPet()) - { - final Pet pet = (Pet) this; - final int specialSkillId = PetAcquireList.getInstance().getSpecialSkillByType(pet.getPetData().getType()); - addSkill(SkillData.getInstance().getSkill(specialSkillId, pet.getEvolveLevel() + 1)); - } if (_owner != null) { - sendPacket(new PetInfo(this, 1)); - sendPacket(new ExPetSkillList(true, this)); - if (getInventory() != null) + if (isPet()) { - sendPacket(new PetItemList(getInventory().getItems())); + sendPacket(new PetInfo(this, 1)); + sendPacket(new ExPetSkillList(true, (Pet) this)); + if (getInventory() != null) + { + sendPacket(new PetItemList(getInventory().getItems())); + } } sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); + World.getInstance().forEachVisibleObject(getOwner(), Player.class, player -> player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player)))); } - World.getInstance().forEachVisibleObject(getOwner(), Player.class, player -> player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player)))); + final Party party = _owner.getParty(); if (party != null) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java index ff1d0e43e2..e854fca7ed 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pet; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExPetSkillList implements IClientOutgoingPacket { private final boolean _onEnter; - private final Summon _pet; + private final Pet _pet; - public ExPetSkillList(boolean onEnter, Summon pet) + public ExPetSkillList(boolean onEnter, Pet pet) { _onEnter = onEnter; _pet = pet; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Summon.java index 0c440e87c5..2a19e657bd 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.ai.SummonAI; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; -import org.l2jmobius.gameserver.data.xml.PetAcquireList; -import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.NpcInfoType; import org.l2jmobius.gameserver.enums.Race; @@ -133,24 +131,22 @@ public abstract class Summon extends Playable setFollowStatus(true); updateAndBroadcastStatus(0); - if (isPet()) - { - final Pet pet = (Pet) this; - final int specialSkillId = PetAcquireList.getInstance().getSpecialSkillByType(pet.getPetData().getType()); - addSkill(SkillData.getInstance().getSkill(specialSkillId, pet.getEvolveLevel() + 1)); - } if (_owner != null) { - sendPacket(new PetInfo(this, 1)); - sendPacket(new ExPetSkillList(true, this)); - if (getInventory() != null) + if (isPet()) { - sendPacket(new PetItemList(getInventory().getItems())); + sendPacket(new PetInfo(this, 1)); + sendPacket(new ExPetSkillList(true, (Pet) this)); + if (getInventory() != null) + { + sendPacket(new PetItemList(getInventory().getItems())); + } } sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); + World.getInstance().forEachVisibleObject(getOwner(), Player.class, player -> player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player)))); } - World.getInstance().forEachVisibleObject(getOwner(), Player.class, player -> player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player)))); + final Party party = _owner.getParty(); if (party != null) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java index ff1d0e43e2..e854fca7ed 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetSkillList.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pet; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExPetSkillList implements IClientOutgoingPacket { private final boolean _onEnter; - private final Summon _pet; + private final Pet _pet; - public ExPetSkillList(boolean onEnter, Summon pet) + public ExPetSkillList(boolean onEnter, Pet pet) { _onEnter = onEnter; _pet = pet;