Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[11519] Fix player totem icons (those under player portrait)

SMSG_TOTEM_CREATED must be sent before totem added to map.

Signed-off-by: NoFantasy <nofantasy@nf.no>
  • Loading branch information...
commit 9be593b8fa3124a8acb73dce38af8a76955e49f0 1 parent b957b2b
NoFantasy authored

Showing 2 changed files with 4 additions and 3 deletions. Show diff stats Hide diff stats

  1. +3 2 src/game/SpellEffects.cpp
  2. +1 1  src/shared/revision_nr.h
5 src/game/SpellEffects.cpp
@@ -7997,8 +7997,7 @@ void Spell::DoSummonTotem(SpellEffectIndex eff_idx, uint8 slot_dbc)
7997 7997 if (m_caster->IsFFAPvP())
7998 7998 pTotem->SetFFAPvP(true);
7999 7999
8000   - pTotem->Summon(m_caster);
8001   -
  8000 + // sending SMSG_TOTEM_CREATED before add to map (done in Summon)
8002 8001 if (slot < MAX_TOTEM_SLOT && m_caster->GetTypeId() == TYPEID_PLAYER)
8003 8002 {
8004 8003 WorldPacket data(SMSG_TOTEM_CREATED, 1 + 8 + 4 + 4);
@@ -8008,6 +8007,8 @@ void Spell::DoSummonTotem(SpellEffectIndex eff_idx, uint8 slot_dbc)
8008 8007 data << uint32(m_spellInfo->Id);
8009 8008 ((Player*)m_caster)->SendDirectMessage(&data);
8010 8009 }
  8010 +
  8011 + pTotem->Summon(m_caster);
8011 8012 }
8012 8013
8013 8014 void Spell::EffectEnchantHeldItem(SpellEffectIndex eff_idx)
2  src/shared/revision_nr.h
... ... @@ -1,4 +1,4 @@
1 1 #ifndef __REVISION_NR_H__
2 2 #define __REVISION_NR_H__
3   - #define REVISION_NR "11518"
  3 + #define REVISION_NR "11519"
4 4 #endif // __REVISION_NR_H__

4 comments on commit 9be593b

darkstalker

Nice one, this probably fixes TotemTimers addon as well.

click
click commented on 9be593b

@nofantasy: you may want to add this as well to get some bugs out of the way.... :)
TrinityCore/TrinityCore@c377848

(Well, at least something similar, I have no clue how you handle it in MaNGOS anymore)

darkstalker

Totem summoning works fine on mangos

tibbi commented on 9be593b

ye, summoning works fine. Also totem timers work already well, what a feeling to play a shamy :D thx

Please sign in to comment.
Something went wrong with that request. Please try again.