Skip to content

Timed event rework #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Foereaper merged 3 commits into from
Jul 28, 2025
Merged

Timed event rework #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf33f91
Refactor timed event processing
Foereaper Jul 28, 2025
b3dc00c
Remove Eluna event processor update code
Foereaper Jul 28, 2025
e4553e9
Update Eluna submodule
Foereaper Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/server/game/Entities/GameObject/GameObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,15 +472,7 @@ void GameObject::Update(uint32 diff)
{
#ifdef ELUNA
if (Eluna* e = GetEluna())
{
e->UpdateAI(this, diff);

if (elunaMapEvents) // can be null on maps without eluna
elunaMapEvents->Update(diff);

if (elunaWorldEvents)
elunaWorldEvents->Update(diff);
}
#endif
m_Events.Update(diff);

Expand Down
8 changes: 0 additions & 8 deletions src/server/game/Entities/Unit/Unit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,14 +437,6 @@ Unit::~Unit()

void Unit::Update(uint32 p_time)
{
#ifdef ELUNA
if(elunaMapEvents) // can be null on maps without eluna
elunaMapEvents->Update(p_time);

if (elunaWorldEvents) // can be null on maps without eluna
elunaWorldEvents->Update(p_time);
#endif

// WARNING! Order of execution here is important, do not change.
// Spells must be processed with event system BEFORE they go to _UpdateSpells.
// Or else we may have some SPELL_STATE_FINISHED spells stalled in pointers, that is bad.
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/LuaEngine
Open in desktop
Submodule LuaEngine updated 3 files
+20 −3 ElunaEventMgr.cpp
+3 −1 ElunaEventMgr.h
+1 −1 LuaEngine.cpp