benemorius

As I said I don't know my way around this code yet, but this seems more appropriate. --- src/game/Spell.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 4eb296c..9ade160 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2415,6 +2415,10 @@ void Spell::cast(bool skipCheck) { if (m_spellInfo->SpellFamilyFlags&0x0000008000000000LL) // Ice Block m_preCastSpell = 41425; // Hypothermia + else if(m_spellInfo->SchoolMask & SPELL_SCHOOL_MASK_ARCANE) + { + m_caster->RemoveAurasDueToSpell(36032); + } break; } case SPELLFAMILY_PRIEST: --

A most welcome improvement, though not quite official. The debuff should be removed upon casting any damage arcane spell. As it is, the patch removes the debuff when an arcane spell does damage rather than when the arcane spell is actually cast. This also brings to my attention that the debuff doesn't appear to be stacking properly. I'm new to the project and haven't yet delved in to the code that brings spells and buffs to life, so I don't know whether there's a fundamental reason for that to remain unimplemented.

add affected account name to chat reply of targeted set gmlevel previously the affected account name was only available to the reply when the account was specified in the command and not when the player was targeted --- src/game/Level3.cpp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 6f1be30..c7d8a28 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -758,6 +758,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args) arg2 = arg1; targetAccountId = targetPlayer->GetSession()->GetAccountId(); + accmgr.GetName(targetAccountId, targetAccountName); } else { --

fixes: Using the in-game `account set gmlevel $account $level` while having no target results in $level being applied to self in addition to $account. Patched behavior causes $level to be applied only to targeted or specified $account. Self target and no target are ignored patches against: 7501 --- src/game/Level3.cpp | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index eb5f927..6f1be30 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -791,7 +791,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args) } /// can set security level only for target with less security and to less security that we have - /// This is also reject self apply in fact + /// This will reject self apply by specify account name if(HasLowerSecurityAccount(NULL,targetAccountId,true)) return false; @@ -804,7 +804,8 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args) return false; } - if(targetPlayer) + /// This will prevent self apply by self target or no target + if(targetPlayer && m_session->GetPlayer()!=targetPlayer) { ChatHandler(targetPlayer).PSendSysMessage(LANG_YOURS_SECURITY_CHANGED,GetNameLink().c_str(), gm); targetPlayer->GetSession()->SetSecurity(gm); --