Fix infinite loop for OnDuelEnd hook

Eluna-Ports · Jan 1, 2025 · 95552f7 · 95552f7
1 parent 9654142
commit 95552f7
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp
@@ -7332,11 +7332,7 @@ void Player::DuelComplete(DuelCompleteType type)
         data << GetName();
         SendMessageToSet(data, true);
     }
-#ifdef BUILD_ELUNA
-    // used by eluna
-    if (Eluna* e = GetEluna())
-        e->OnDuelEnd(duel->opponent, this, type);
-#endif
+
     // Remove Duel Flag object
     if (GameObject* obj = GetMap()->GetGameObject(GetGuidValue(PLAYER_DUEL_ARBITER)))
         duel->initiator->RemoveGameObject(obj, true);
@@ -7382,10 +7378,20 @@ void Player::DuelComplete(DuelCompleteType type)
     duel->opponent->SetGuidValue(PLAYER_DUEL_ARBITER, ObjectGuid());
     duel->opponent->SetUInt32Value(PLAYER_DUEL_TEAM, 0);
 
+#ifdef BUILD_ELUNA
+    Player* duelOpponent = duel->opponent;
+#endif
+
     delete duel->opponent->duel;
     duel->opponent->duel = nullptr;
     delete duel;
     duel = nullptr;
+
+#ifdef BUILD_ELUNA
+    // used by eluna
+    if (Eluna* e = GetEluna())
+        e->OnDuelEnd(duelOpponent, this, type);
+#endif
 }
 
 //---------------------------------------------------------//