From 6dfe70f8a0a6b4d145cc97146535b6870709f91d Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 2 Oct 2019 11:07:09 +0000 Subject: [PATCH] Castle siege start and finish sound messages. Contributed by Sahar. --- .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg | 9 +++++++++ .../gameserver/model/entity/siege/Siege.java | 11 +++++++++++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ .../org/l2jmobius/gameserver/model/entity/Siege.java | 3 +++ 17 files changed, 65 insertions(+) create mode 100644 L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Siege.java index aa1e304d71..42e6acf9bf 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_e.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_e.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Siege.java index 4b9c106711..c26c2cace7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_e.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_e.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siege.java index 4b9c106711..c26c2cace7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_e.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_e.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Siege.java index 4b9c106711..c26c2cace7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_e.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_e.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Siege.java index 0e1d896ca4..747392347f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Siege.java index 4b9c106711..8c9ea43a04 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Siege.java index 4b9c106711..8c9ea43a04 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Siege.java index 4b9c106711..8c9ea43a04 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg b/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg new file mode 100644 index 0000000000..cad9dbe2fc --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg @@ -0,0 +1,9 @@ +#Olympiad Properties +#Wed Oct 02 13:35:09 EEST 2019 +NextWeeklyChange_DateFormat=9 \u039F\u03BA\u03C4 2019, 1\:30\:24 \u03BC.\u03BC. +ValdationEnd=0 +NextWeeklyChange=1570617024580 +Period=0 +CurrentCycle=1 +OlympiadEnd=1572602400580 +OlympiadEnd_DateFormat=1 \u039D\u03BF\u03B5 2019, 12\:00\:00 \u03BC.\u03BC. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java index c582ad4da8..e965904b42 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java @@ -52,6 +52,7 @@ import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -310,6 +311,11 @@ public class Siege if (_isInProgress) { announceToPlayer("The siege of " + getCastle().getName() + " has finished!", false); + final PlaySound sound = new PlaySound("systemmsg_e.18"); + for (PlayerInstance player : World.getInstance().getAllPlayers()) + { + player.sendPacket(sound); + } LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has finished! " + fmt.format(new Date(System.currentTimeMillis()))); @@ -614,6 +620,11 @@ public class Siege ThreadPool.schedule(new ScheduleEndSiegeTask(getCastle()), 1000); announceToPlayer("The siege of " + getCastle().getName() + " has started!", false); + final PlaySound sound = new PlaySound("systemmsg_e.17"); + for (PlayerInstance player : World.getInstance().getAllPlayers()) + { + player.sendPacket(sound); + } LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has started! " + fmt.format(new Date(System.currentTimeMillis()))); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Siege.java index 7769fae7d7..36b9704a76 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -62,6 +62,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.castle.OnCastleSiegeOwn import org.l2jmobius.gameserver.model.events.impl.sieges.castle.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBrExtraUserInfo; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -253,6 +254,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(getCastle().getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_e.18")); if (getCastle().getOwnerId() > 0) { @@ -522,6 +524,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(getCastle().getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_e.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Siege.java index 969212f9bf..5ea0f5b05c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Siege.java index 969212f9bf..5ea0f5b05c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Siege.java index 969212f9bf..5ea0f5b05c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Siege.java index 969212f9bf..5ea0f5b05c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Siege.java index 969212f9bf..5ea0f5b05c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Siege.java index 969212f9bf..5ea0f5b05c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Siege.java @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -252,6 +253,7 @@ public class Siege implements Siegable SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.18")); if (_castle.getOwnerId() > 0) { @@ -531,6 +533,7 @@ public class Siege implements Siegable final SystemMessage sm = new SystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); + Broadcast.toAllOnlinePlayers(new PlaySound("systemmsg_eu.17")); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeStart(this), getCastle());