From 158cf41fd39de01d3e80e33e43246536613a6597 Mon Sep 17 00:00:00 2001 From: Player Name Date: Mon, 13 May 2024 15:00:37 +0000 Subject: [PATCH] Fixed Bork/Surok instanced area music --- .../varrock/quest/whatliesbelow/WLBelowCutscene.java | 1 + .../src/main/content/region/wilderness/handlers/BorkNPC.java | 1 + .../node/entity/player/info/login/LoginConfiguration.java | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/Server/src/main/content/region/misthalin/varrock/quest/whatliesbelow/WLBelowCutscene.java b/Server/src/main/content/region/misthalin/varrock/quest/whatliesbelow/WLBelowCutscene.java index 718d90602..d1c154c5d 100644 --- a/Server/src/main/content/region/misthalin/varrock/quest/whatliesbelow/WLBelowCutscene.java +++ b/Server/src/main/content/region/misthalin/varrock/quest/whatliesbelow/WLBelowCutscene.java @@ -297,6 +297,7 @@ public class WLBelowCutscene extends CutscenePlugin { @Override public void configure() { region = DynamicRegion.create(12854); + region.setMusicId(250); setRegionBase(); registerRegion(region.getId()); } diff --git a/Server/src/main/content/region/wilderness/handlers/BorkNPC.java b/Server/src/main/content/region/wilderness/handlers/BorkNPC.java index 1b603410b..c0a28f080 100644 --- a/Server/src/main/content/region/wilderness/handlers/BorkNPC.java +++ b/Server/src/main/content/region/wilderness/handlers/BorkNPC.java @@ -532,6 +532,7 @@ public class BorkNPC extends AbstractNPC { public void configure() { region = DynamicRegion.create(12374); region.setMulticombat(true); + region.setMusicId(488); setRegionBase(); registerRegion(region.getId()); } diff --git a/Server/src/main/core/game/node/entity/player/info/login/LoginConfiguration.java b/Server/src/main/core/game/node/entity/player/info/login/LoginConfiguration.java index 4dc80dda2..3406bee18 100644 --- a/Server/src/main/core/game/node/entity/player/info/login/LoginConfiguration.java +++ b/Server/src/main/core/game/node/entity/player/info/login/LoginConfiguration.java @@ -140,9 +140,11 @@ public final class LoginConfiguration { player.updateAppearance(); player.getPlayerFlags().setUpdateSceneGraph(true); player.getPacketDispatch().sendInterfaceConfig(226, 1, true); + if(player.getGlobalData().getTestStage() == 3 && !player.getEmoteManager().isUnlocked(Emotes.SAFETY_FIRST)){ player.getEmoteManager().unlock(Emotes.SAFETY_FIRST); } + for (Item item : player.getEquipment().toArray()) { //Run equip hooks for all items equipped on login. //We should have already been doing this. @@ -164,6 +166,7 @@ public final class LoginConfiguration { } } } + SpellBookManager.SpellBook currentSpellBook = SpellBookManager.SpellBook.forInterface(player.getSpellBookManager().getSpellBook()); if (currentSpellBook == SpellBookManager.SpellBook.ANCIENT && !hasRequirement(player, "Desert Treasure")) { player.sendMessage(colorize("%RAs you can no longer use Ancient Magic, you have been set back to Modern.")); @@ -173,6 +176,7 @@ public final class LoginConfiguration { player.getSpellBookManager().setSpellBook(SpellBookManager.SpellBook.MODERN); } player.getSpellBookManager().update(player); + // 1050 is checked client-side for making piety/chivalry disallowed sfx, likely due to the minigame requirement. // Set it here unconditionally until the minigame is implemented. setVarbit(player, 3909, 8, false);