From 8f2a0b0133886f675fab8a38db7a41f310103b87 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 24 Oct 2021 13:48:20 +0000 Subject: [PATCH] Attacked clan must see single sword icon on attackers. --- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/network/serverpackets/RelationChanged.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4553db855c..de6a60a4ab 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1051,7 +1051,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f5f0ee0ff3..2be681f086 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1053,7 +1053,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e77ccc2b2c..557b5fee6b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1055,7 +1055,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index fe2b70914d..74df939926 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1065,7 +1065,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 69cf1945d0..e5830a8601 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1061,7 +1061,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 6ee073eb12..4dff873e9b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1061,7 +1061,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d06f76f3b2..576511c083 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1061,7 +1061,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 549d2a081d..2f8e8c29fa 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1081,7 +1081,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 71343ef3e2..561efcb002 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1097,7 +1097,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 49979203a7..050c253351 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1039,7 +1039,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 49d6c15eb4..1ed5482ea7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1039,7 +1039,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 740f02505f..645e4e20aa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1037,7 +1037,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e556937ef1..73a0b07aa3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1050,7 +1050,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 245fafddf4..eb3a19e53a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1050,7 +1050,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 2cf6c71a0b..2b793e5f11 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1070,7 +1070,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e4bad72580..d896b7b71e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1036,7 +1036,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 68bcff162a..0a7c7b21cc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -38,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_CLAN_MEMBER = 0x40; // true if is in clan public static final int RELATION_LEADER = 0x80; // true if is clan leader public static final int RELATION_CLAN_MATE = 0x100; // true if is in same clan - public static final int RELATION_INSIEGE = 0x00; // true if in siege + public static final int RELATION_INSIEGE = 0x200; // true if in siege public static final int RELATION_ATTACKER = 0x400; // true when attacker public static final int RELATION_ALLY = 0x800; // blue siege icon, cannot have if red public static final int RELATION_ENEMY = 0x1000; // true when red icon, doesn't matter with blue diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4e359f2812..afdf7e84e2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1101,7 +1101,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e82e3c361d..9bbe472330 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1132,7 +1132,7 @@ public class PlayerInstance extends Playable case DECLARATION: case BLOOD_DECLARATION: { - if (war.getAttackerClanId() == target.getClanId()) + if (war.getAttackerClanId() != target.getClanId()) { result |= RelationChanged.RELATION_DECLARED_WAR; }