War announce should send message to killer and victim too.

Contributed by Enryu.
This commit is contained in:
MobiusDevelopment
2022-05-31 12:07:04 +00:00
parent 7222163a91
commit 7de4649b17
8 changed files with 16 additions and 16 deletions

View File

@@ -117,11 +117,11 @@ public class ClanWar
SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1); SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1);
sm.addPcName(victim); sm.addPcName(victim);
sm.addString(killerClan.getName()); sm.addString(killerClan.getName());
victimClan.broadcastToOtherOnlineMembers(sm, victim); victimClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1); sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
sm.addString(victimClan.getName()); sm.addString(victimClan.getName());
sm.addPcName(killer); sm.addPcName(killer);
killerClan.broadcastToOtherOnlineMembers(sm, killer); killerClan.broadcastToOnlineMembers(sm);
if (killerClan.getId() == _attackerClanId) if (killerClan.getId() == _attackerClanId)
{ {
_attackerKillCount.incrementAndGet(); _attackerKillCount.incrementAndGet();

View File

@@ -117,11 +117,11 @@ public class ClanWar
SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1); SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1);
sm.addPcName(victim); sm.addPcName(victim);
sm.addString(killerClan.getName()); sm.addString(killerClan.getName());
victimClan.broadcastToOtherOnlineMembers(sm, victim); victimClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1); sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
sm.addString(victimClan.getName()); sm.addString(victimClan.getName());
sm.addPcName(killer); sm.addPcName(killer);
killerClan.broadcastToOtherOnlineMembers(sm, killer); killerClan.broadcastToOnlineMembers(sm);
if (killerClan.getId() == _attackerClanId) if (killerClan.getId() == _attackerClanId)
{ {
_attackerKillCount.incrementAndGet(); _attackerKillCount.incrementAndGet();

View File

@@ -117,11 +117,11 @@ public class ClanWar
SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1); SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1);
sm.addPcName(victim); sm.addPcName(victim);
sm.addString(killerClan.getName()); sm.addString(killerClan.getName());
victimClan.broadcastToOtherOnlineMembers(sm, victim); victimClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1); sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
sm.addString(victimClan.getName()); sm.addString(victimClan.getName());
sm.addPcName(killer); sm.addPcName(killer);
killerClan.broadcastToOtherOnlineMembers(sm, killer); killerClan.broadcastToOnlineMembers(sm);
if (killerClan.getId() == _attackerClanId) if (killerClan.getId() == _attackerClanId)
{ {
_attackerKillCount.incrementAndGet(); _attackerKillCount.incrementAndGet();

View File

@@ -117,11 +117,11 @@ public class ClanWar
SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1); SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1);
sm.addPcName(victim); sm.addPcName(victim);
sm.addString(killerClan.getName()); sm.addString(killerClan.getName());
victimClan.broadcastToOtherOnlineMembers(sm, victim); victimClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1); sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
sm.addString(victimClan.getName()); sm.addString(victimClan.getName());
sm.addPcName(killer); sm.addPcName(killer);
killerClan.broadcastToOtherOnlineMembers(sm, killer); killerClan.broadcastToOnlineMembers(sm);
if (killerClan.getId() == _attackerClanId) if (killerClan.getId() == _attackerClanId)
{ {
_attackerKillCount.incrementAndGet(); _attackerKillCount.incrementAndGet();

View File

@@ -117,11 +117,11 @@ public class ClanWar
SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1); SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1);
sm.addPcName(victim); sm.addPcName(victim);
sm.addString(killerClan.getName()); sm.addString(killerClan.getName());
victimClan.broadcastToOtherOnlineMembers(sm, victim); victimClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1); sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
sm.addString(victimClan.getName()); sm.addString(victimClan.getName());
sm.addPcName(killer); sm.addPcName(killer);
killerClan.broadcastToOtherOnlineMembers(sm, killer); killerClan.broadcastToOnlineMembers(sm);
if (killerClan.getId() == _attackerClanId) if (killerClan.getId() == _attackerClanId)
{ {
_attackerKillCount.incrementAndGet(); _attackerKillCount.incrementAndGet();

View File

@@ -117,11 +117,11 @@ public class ClanWar
SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1); SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1);
sm.addPcName(victim); sm.addPcName(victim);
sm.addString(killerClan.getName()); sm.addString(killerClan.getName());
victimClan.broadcastToOtherOnlineMembers(sm, victim); victimClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1); sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
sm.addString(victimClan.getName()); sm.addString(victimClan.getName());
sm.addPcName(killer); sm.addPcName(killer);
killerClan.broadcastToOtherOnlineMembers(sm, killer); killerClan.broadcastToOnlineMembers(sm);
if (killerClan.getId() == _attackerClanId) if (killerClan.getId() == _attackerClanId)
{ {
_attackerKillCount.incrementAndGet(); _attackerKillCount.incrementAndGet();

View File

@@ -117,11 +117,11 @@ public class ClanWar
SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1); SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1);
sm.addPcName(victim); sm.addPcName(victim);
sm.addString(killerClan.getName()); sm.addString(killerClan.getName());
victimClan.broadcastToOtherOnlineMembers(sm, victim); victimClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1); sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
sm.addString(victimClan.getName()); sm.addString(victimClan.getName());
sm.addPcName(killer); sm.addPcName(killer);
killerClan.broadcastToOtherOnlineMembers(sm, killer); killerClan.broadcastToOnlineMembers(sm);
if (killerClan.getId() == _attackerClanId) if (killerClan.getId() == _attackerClanId)
{ {
_attackerKillCount.incrementAndGet(); _attackerKillCount.incrementAndGet();

View File

@@ -117,11 +117,11 @@ public class ClanWar
SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1); SystemMessage sm = new SystemMessage(SystemMessageId.BECAUSE_C1_WAS_KILLED_BY_A_CLAN_MEMBER_OF_S2_CLAN_REPUTATION_DECREASED_BY_1);
sm.addPcName(victim); sm.addPcName(victim);
sm.addString(killerClan.getName()); sm.addString(killerClan.getName());
victimClan.broadcastToOtherOnlineMembers(sm, victim); victimClan.broadcastToOnlineMembers(sm);
sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1); sm = new SystemMessage(SystemMessageId.BECAUSE_CLAN_MEMBER_OF_S1_WAS_KILLED_BY_C2_CLAN_REPUTATION_INCREASED_BY_1);
sm.addString(victimClan.getName()); sm.addString(victimClan.getName());
sm.addPcName(killer); sm.addPcName(killer);
killerClan.broadcastToOtherOnlineMembers(sm, killer); killerClan.broadcastToOnlineMembers(sm);
if (killerClan.getId() == _attackerClanId) if (killerClan.getId() == _attackerClanId)
{ {
_attackerKillCount.incrementAndGet(); _attackerKillCount.incrementAndGet();