From 740dc96dfa5ee3517ec284610fe9cdbb87cfccf0 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 15 Jan 2022 22:06:01 +0000 Subject: [PATCH] Addition of relation info for summon packets. Thanks to Index. --- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../l2jmobius/gameserver/network/serverpackets/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../gameserver/network/serverpackets/pet/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../gameserver/network/serverpackets/pet/ExPetInfo.java | 4 +++- .../gameserver/network/serverpackets/SummonInfo.java | 4 +++- .../gameserver/network/serverpackets/pet/ExPetInfo.java | 4 +++- 42 files changed, 126 insertions(+), 42 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index c1272bd98c..e44baff9c9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 377301825d..26972d8873 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index c1272bd98c..e44baff9c9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 377301825d..26972d8873 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 20aeaa3e17..776642c437 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index cb4e7ccc17..975c676fd0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2ebf1dc7f0..4931488972 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -34,6 +34,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -217,7 +219,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 2d92796c75..0d09fb3efb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final int _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0); + packet.writeD(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 377301825d..26972d8873 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java index 4f27307988..cff1551196 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java @@ -35,6 +35,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -59,6 +60,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 377301825d..26972d8873 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java index 4f27307988..cff1551196 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java @@ -35,6 +35,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -59,6 +60,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index cb4e7ccc17..975c676fd0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -34,6 +34,7 @@ public class SummonInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -58,6 +59,7 @@ public class SummonInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java index 7e2ada37c2..328fc72a8e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java @@ -35,6 +35,7 @@ public class ExPetInfo extends AbstractMaskPacket { private final Summon _summon; private final Player _attacker; + private final long _relation; private final int _value; private final byte[] _masks = new byte[] { @@ -59,6 +60,7 @@ public class ExPetInfo extends AbstractMaskPacket { _summon = summon; _attacker = attacker; + _relation = (attacker != null) && (summon.getOwner() != null) ? summon.getOwner().getRelation(attacker) : 0; _title = (summon.getOwner() != null) && summon.getOwner().isOnline() ? summon.getOwner().getName() : ""; _value = value; _abnormalVisualEffects = summon.getEffectList().getCurrentAbnormalVisualEffects(); @@ -218,7 +220,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0); + packet.writeQ(_relation); } if (containsMask(NpcInfoType.TITLE)) {