[Fix] Arena: Anti Stealth Buff Objects Spawn Fix

[FunkyBit]

What bug does the patch fix?

It fixes spawing of the buff objects in arenas that grant after 90 seconds of the match a buff that increases stealth detection. These objects didn't spwan anymore.

For which repository revision was the patch created?

For mangos-0.12 originally. As far as I checked the problem exists in master, too.

Who has been writing this patch? Please include either forum user names or email addresses.

Myself

diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index bed382d..b98e9de 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -53,6 +53,8 @@ BattleGround::BattleGround()
    m_LevelMax          = 0;
    m_InBGFreeSlotQueue = false;
    m_SetDeleteThis     = false;
+
+    m_ArenaBuffTimer    = 0;

    m_MaxPlayersPerTeam = 0;
    m_MaxPlayers        = 0;
@@ -215,11 +236,11 @@ void BattleGround::Update(uint32 diff)
    if (isArena() && !m_ArenaBuffSpawned)
    {
        // 60 seconds after start the buffobjects in arena should get spawned
-        if (m_StartTime > START_DELAY1 + ARENA_SPAWN_BUFF_OBJECTS)
+        if (m_ArenaBuffTimer > START_DELAY1 + ARENA_SPAWN_BUFF_OBJECTS)
        {
            SpawnEvent(ARENA_BUFF_EVENT, 0, true);
            m_ArenaBuffSpawned = true;
-        }
+        } else m_ArenaBuffTimer += diff;
    }

    /*********************************************************/
diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h
index 5ee9041..502cf3a 100644
--- a/src/game/BattleGround.h
+++ b/src/game/BattleGround.h
@@ -28,7 +28,7 @@
#define BG_EVENT_DOOR 254
// only arena event
// cause this buff apears 90sec after start in every bg i implement it here
-#define ARENA_BUFF_EVENT 252
+#define ARENA_BUFF_EVENT 253


class Creature;
@@ -532,6 +532,7 @@ class BattleGround
        bool   m_InBGFreeSlotQueue;                         // used to make sure that BG is only once inserted into the BattleGroundMgr.BGFreeSlotQueue[bgTypeId] deque
        bool   m_SetDeleteThis;                             // used for safe deletion of the bg after end / all players leave
        bool   m_IsArena;
+        uint32 m_ArenaBuffTimer;
        uint8  m_Winner;                                    // 0=alliance, 1=horde, 2=none
        int32  m_StartDelayTime;
        bool   m_IsRated;                                   // is this battle rated?

Problem was that 'm_StartTime' is not increasing, it stays 0, and the if always results in false.

The part about

-#define ARENA_BUFF_EVENT 252

+#define ARENA_BUFF_EVENT 253

is optinal and not realy MaNGOS problem and only included because UDB and TBCDB use 253 as spawn event for these objects. Otherwise the database content must be changed in the relevant parts from 253 to 252 as event for these objects.

pastebin link

With best regards

Funkybit

[Revils]

the original code works fine for me on rev 9119 mangos-0.15, the variable 'm_StartTime' is increased and the spawnevent is fired so the only problem, as you noticed ,it's on database (UDB 386 for me), since there's 253 instead of 252. I simpled changed the value on battleground_events and gameobject_battleground tables to fix it.

[FunkyBit]

Hmm... okay... I printed out the value of m_StartTime and it stayed 0...

[LordJZ]

If I remember correctly those objects should respawn.

[FunkyBit]

Yes, of cause. The do pretty fast. But at first they have to be spawned in the first place since they are not spawned initialy on map creation.

[FunkyBit]

OK, found the problem.

The Master Branch is working.

Master -> Battleground.cpp Line 505/506:

//update start time 
m_StartTime += diff;

These two lines are missing in mangos-0.12.

As written above I'm on mangos-0.12 and just looked over the same parts that are hit by the patch and couldn't find a difference.

So it works for Master, but not for mangos-0-12.

[henhouse]

Thank you! This has been a problem in 0.12 only for some time. I spoke with balrok about it a while and he told me to try adding the like 505/506 in BattleGround.cpp like you have added yourself, but it required a few more checks.

Works 100%, tested and timing is correct.

[DasBlub]

this has been fixed here: http://github.com/mangos/mangos/commit/a9405a180b4c3adff632dac46b67642f9524401a

so this thread can be moved to accepted or rejected

[kisslota]

UPDATE gameobject_battleground SET
event1 = 252
WHERE guid IN (90108, 90107, 90114, 90118, 90117, 90113);

Also it is not necessary any changes in a core

[stfx]

As DasBlub mentioned. Has been fixed in http://github.com/mangos/mangos/commit/a9405a180b4c3adff632dac46b67642f9524401a on One. Thanks

PS: Arena buff event has also been correctly changed to 253 in [11106]