Merge branch 'master' into Playerbot

src/server/game/Entities/Player/Player.cpp

@@ -9366,12 +9366,10 @@ void Player::Whisper(std::string_view text, Language language, Player* target, b
     }
 }
 
-void Player::Whisper(uint32 textId, Player* target, bool /*isBossWhisper = false*/)
+void Player::Whisper(uint32 textId, Player* target, bool isBossWhisper)
 {
     if (!target)
-    {
         return;
-    }
 
     BroadcastText const* bct = sObjectMgr->GetBroadcastText(textId);
     if (!bct)
@@ -9382,7 +9380,10 @@ void Player::Whisper(uint32 textId, Player* target, bool /*isBossWhisper = false
 
     LocaleConstant locale = target->GetSession()->GetSessionDbLocaleIndex();
     WorldPacket data;
-    ChatHandler::BuildChatPacket(data, CHAT_MSG_WHISPER, LANG_UNIVERSAL, this, target, bct->GetText(locale, getGender()), 0, "", locale);
+    if (isBossWhisper)
+        ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_WHISPER, LANG_UNIVERSAL, this, target, bct->GetText(locale, getGender()), 0, "", locale);
+    else
+        ChatHandler::BuildChatPacket(data, CHAT_MSG_WHISPER, LANG_UNIVERSAL, this, target, bct->GetText(locale, getGender()), 0, "", locale);
     target->SendDirectMessage(&data);
 }
 

src/server/game/Miscellaneous/Language.h

@@ -1159,7 +1159,9 @@ enum AcoreStrings
 
     LANG_CMD_CAST_ERROR_CODE            = 5084,
 
-    // Room for more strings    5084-9999
+    LANG_CMD_GO_RESPAWN                 = 5085,
+
+    // Room for more strings    5086-9999
 
     // Level requirement notifications
     LANG_SAY_REQ                        = 6604,

src/server/game/Spells/SpellEffects.cpp

@@ -809,23 +809,6 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
 
                     break;
                 }
-            // Vanish (not exist)
-            case 18461:
-                {
-                    unitTarget->RemoveMovementImpairingAuras(true);
-                    unitTarget->RemoveAurasByType(SPELL_AURA_MOD_STALKED);
-
-                    // See if we already are stealthed. If so, we're done.
-                    if (unitTarget->HasAura(1784))
-                        return;
-
-                    // Reset cooldown on stealth if needed
-                    if (unitTarget->GetTypeId() == TYPEID_PLAYER && unitTarget->ToPlayer()->HasSpellCooldown(1784))
-                        unitTarget->ToPlayer()->RemoveSpellCooldown(1784);
-
-                    unitTarget->CastSpell(unitTarget, 1784, true);
-                    return;
-                }
             // Demonic Empowerment -- succubus
             case 54437:
                 {
@@ -4079,18 +4062,6 @@ void Spell::EffectSanctuary(SpellEffIndex /*effIndex*/)
 
     // Xinef: Set last sanctuary time
     unitTarget->m_lastSanctuaryTime = GameTime::GetGameTimeMS().count();
-
-    // Vanish allows to remove all threat and cast regular stealth so other spells can be used
-    if (m_caster->GetTypeId() == TYPEID_PLAYER
-            && m_spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE
-            && (m_spellInfo->SpellFamilyFlags[0] & SPELLFAMILYFLAG_ROGUE_VANISH))
-    {
-        m_caster->ToPlayer()->RemoveAurasByType(SPELL_AURA_MOD_ROOT);
-
-        //Clean Escape
-        if (m_caster->HasAura(23582))
-            m_caster->CastSpell(m_caster, 23583, true);
-    }
 }
 
 void Spell::EffectAddComboPoints(SpellEffIndex /*effIndex*/)

src/server/scripts/Commands/cs_gobject.cpp

@@ -15,13 +15,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* ScriptData
-Name: gobject_commandscript
-%Complete: 100
-Comment: All gobject related commands
-Category: commandscripts
-EndScriptData */
-
 #include "Chat.h"
 #include "CommandScript.h"
 #include "GameEventMgr.h"
@@ -59,7 +52,8 @@ public:
             { "add temp",  HandleGameObjectAddTempCommand,  SEC_GAMEMASTER,    Console::No },
             { "add",       HandleGameObjectAddCommand,      SEC_ADMINISTRATOR, Console::No },
             { "set phase", HandleGameObjectSetPhaseCommand, SEC_ADMINISTRATOR, Console::No },
-            { "set state", HandleGameObjectSetStateCommand, SEC_ADMINISTRATOR, Console::No }
+            { "set state", HandleGameObjectSetStateCommand, SEC_ADMINISTRATOR, Console::No },
+            { "respawn",   HandleGameObjectRespawn,         SEC_GAMEMASTER,    Console::No }
         };
         static ChatCommandTable commandTable =
         {
@@ -581,6 +575,20 @@ public:
         handler->PSendSysMessage("Set gobject type %d state %u", objectType, *objectState);
         return true;
     }
+
+    static bool HandleGameObjectRespawn(ChatHandler* handler, GameObjectSpawnId guidLow)
+    {
+        GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(guidLow);
+        if (!object)
+        {
+            handler->SendErrorMessage(LANG_COMMAND_OBJNOTFOUND, uint32(guidLow));
+            return false;
+        }
+
+        object->Respawn();
+        handler->PSendSysMessage(LANG_CMD_GO_RESPAWN, object->GetNameForLocaleIdx(handler->GetSessionDbcLocale()), object->GetEntry(), object->GetSpawnId());
+        return true;
+    }
 };
 
 void AddSC_gobject_commandscript()

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp

@@ -82,6 +82,8 @@ struct boss_the_lurker_below : public BossAI
         if (GameObject* pool = instance->GetGameObject(DATA_STRANGE_POOL))
         {
             pool->Respawn();
+            pool->SetRespawnTime(10);
+            pool->SaveRespawnTime(10);
         }
         me->DespawnOrUnsummon(2000);
     }

src/server/scripts/Spells/spell_rogue.cpp

@@ -693,6 +693,65 @@ class spell_rog_pickpocket : public SpellScript
     }
 };
 
+enum vanish
+{
+    SPELL_PARALYZE = 38132,
+    SPELL_CLEAN_ESCAPE_AURA = 23582,
+    SPELL_CLEAN_ESCAPE_HEAL = 23583
+};
+
+// 18461 - Vanish Purge (Server Side)
+class spell_rog_vanish_purge : public SpellScript
+{
+    PrepareSpellScript(spell_rog_vanish_purge);
+
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_PARALYZE });
+    }
+
+    void HandleRootRemove(SpellEffIndex /*effIndex*/)
+    {
+        if (GetCaster() && !GetCaster()->HasAura(SPELL_PARALYZE)) // Root from Tainted Core SSC, should not be removed by vanish.
+            GetCaster()->RemoveAurasWithMechanic(1 << MECHANIC_ROOT);
+    }
+
+    void HandleSnareRemove(SpellEffIndex /*effIndex*/)
+    {
+        if (GetCaster())
+            GetCaster()->RemoveAurasWithMechanic(1 << MECHANIC_SNARE);
+    }
+
+    void Register() override
+    {
+        // Blizzard handles EFFECT_0 as the unroot and EFFECT_1 as unsnare. Hence why they are not done in the same place.
+        OnEffectHitTarget += SpellEffectFn(spell_rog_vanish_purge::HandleRootRemove, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
+        OnEffectHitTarget += SpellEffectFn(spell_rog_vanish_purge::HandleSnareRemove, EFFECT_1, SPELL_EFFECT_APPLY_AURA);
+    }
+};
+
+// -1856 - Vanish
+class spell_rog_vanish : public SpellScript
+{
+    PrepareSpellScript(spell_rog_vanish);
+
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_CLEAN_ESCAPE_AURA, SPELL_CLEAN_ESCAPE_HEAL });
+    }
+
+    void HandleEffect(SpellEffIndex /*effIndex*/)
+    {
+        if (GetCaster() && GetCaster()->HasAura(SPELL_CLEAN_ESCAPE_AURA))
+            GetCaster()->CastSpell(GetCaster(), SPELL_CLEAN_ESCAPE_HEAL, true);
+    }
+
+    void Register() override
+    {
+        OnEffectHitTarget += SpellEffectFn(spell_rog_vanish::HandleEffect, EFFECT_2, SPELL_EFFECT_SANCTUARY);
+    }
+};
+
 void AddSC_rogue_spell_scripts()
 {
     RegisterSpellScript(spell_rog_savage_combat);
@@ -709,5 +768,7 @@ void AddSC_rogue_spell_scripts()
     RegisterSpellScript(spell_rog_tricks_of_the_trade);
     RegisterSpellScript(spell_rog_tricks_of_the_trade_proc);
     RegisterSpellScript(spell_rog_pickpocket);
+    RegisterSpellScript(spell_rog_vanish_purge);
+    RegisterSpellScript(spell_rog_vanish);
 }