Core/Spells: Also prevent using self-resurrection spells like Reincarnation when under effect of SPELL_AURA_PREVENT_RESSURECTION

1 files changed, 3 insertions, 0 deletions

diff --git a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp
index 2043d88adfc..716aaa9e74f 100755
--- a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp
@@ -540,6 +540,9 @@ void WorldSession::HandleSelfResOpcode(WorldPacket & /*recv_data*/)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SELF_RES");                  // empty opcode
 
+    if (_player->HasAuraType(SPELL_AURA_PREVENT_RESSURECTION))
+        return; // silent return, client should display error by itself and not send this opcode
+
     if (_player->GetUInt32Value(PLAYER_SELF_RES_SPELL))
     {
         SpellInfo const *spellInfo = sSpellMgr->GetSpellInfo(_player->GetUInt32Value(PLAYER_SELF_RES_SPELL));