From c6f0dd8dd187e5d1b548380039912c1089643f04 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 1 Aug 2022 16:00:05 +0000 Subject: [PATCH] Removed unused parameter from FortSiege battle begin message. Contributed by Enryu. --- .../java/org/l2jmobius/gameserver/model/siege/FortSiege.java | 4 +--- .../java/org/l2jmobius/gameserver/model/siege/FortSiege.java | 4 +--- .../java/org/l2jmobius/gameserver/model/siege/FortSiege.java | 4 +--- .../java/org/l2jmobius/gameserver/model/siege/FortSiege.java | 4 +--- .../java/org/l2jmobius/gameserver/model/siege/FortSiege.java | 4 +--- .../java/org/l2jmobius/gameserver/model/siege/FortSiege.java | 4 +--- .../java/org/l2jmobius/gameserver/model/siege/FortSiege.java | 4 +--- .../java/org/l2jmobius/gameserver/model/siege/FortSiege.java | 4 +--- .../java/org/l2jmobius/gameserver/model/siege/FortSiege.java | 4 +--- 9 files changed, 9 insertions(+), 27 deletions(-) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index 0f7c4c393a..9da61e56da 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -331,9 +331,7 @@ public class FortSiege implements Siegable // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task - final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN); - sm.addCastleId(_fort.getResidenceId()); - announceToPlayer(sm); + announceToPlayer(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN)); saveFortSiege(); LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index 0f7c4c393a..9da61e56da 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -331,9 +331,7 @@ public class FortSiege implements Siegable // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task - final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN); - sm.addCastleId(_fort.getResidenceId()); - announceToPlayer(sm); + announceToPlayer(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN)); saveFortSiege(); LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index 0f7c4c393a..9da61e56da 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -331,9 +331,7 @@ public class FortSiege implements Siegable // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task - final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN); - sm.addCastleId(_fort.getResidenceId()); - announceToPlayer(sm); + announceToPlayer(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN)); saveFortSiege(); LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index e55ce6598f..4acae02227 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -331,9 +331,7 @@ public class FortSiege implements Siegable // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task - final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN); - sm.addCastleId(_fort.getResidenceId()); - announceToPlayer(sm); + announceToPlayer(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN)); saveFortSiege(); LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index e55ce6598f..4acae02227 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -331,9 +331,7 @@ public class FortSiege implements Siegable // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task - final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN); - sm.addCastleId(_fort.getResidenceId()); - announceToPlayer(sm); + announceToPlayer(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN)); saveFortSiege(); LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index e55ce6598f..4acae02227 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -331,9 +331,7 @@ public class FortSiege implements Siegable // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task - final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN); - sm.addCastleId(_fort.getResidenceId()); - announceToPlayer(sm); + announceToPlayer(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN)); saveFortSiege(); LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index e55ce6598f..4acae02227 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -331,9 +331,7 @@ public class FortSiege implements Siegable // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task - final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN); - sm.addCastleId(_fort.getResidenceId()); - announceToPlayer(sm); + announceToPlayer(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN)); saveFortSiege(); LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index e55ce6598f..4acae02227 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -331,9 +331,7 @@ public class FortSiege implements Siegable // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task - final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN); - sm.addCastleId(_fort.getResidenceId()); - announceToPlayer(sm); + announceToPlayer(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN)); saveFortSiege(); LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index e55ce6598f..4acae02227 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -331,9 +331,7 @@ public class FortSiege implements Siegable // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task - final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN); - sm.addCastleId(_fort.getResidenceId()); - announceToPlayer(sm); + announceToPlayer(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_HAS_BEGUN)); saveFortSiege(); LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started.");