From 8214bd48d2263a282a6ee230468eae00ccf79b0c Mon Sep 17 00:00:00 2001 From: insunaa Date: Mon, 17 Jun 2024 07:40:35 +0200 Subject: [PATCH] Battleground: Fix EOTS bases being capturable multiple times --- src/game/Entities/GameObject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/Entities/GameObject.cpp b/src/game/Entities/GameObject.cpp index 4cd6285c5ec..32372ceece3 100644 --- a/src/game/Entities/GameObject.cpp +++ b/src/game/Entities/GameObject.cpp @@ -2464,7 +2464,7 @@ void GameObject::TickCapturePoint() /* PROGRESS EVENTS */ // alliance takes the tower from neutral, contested or horde (if there is no neutral area) to alliance - else if (m_captureState != CAPTURE_STATE_PROGRESS_ALLIANCE && m_captureSlider > CAPTURE_SLIDER_MIDDLE + neutralPercent * 0.5f && progressFaction == ALLIANCE) + else if ((m_captureState != CAPTURE_STATE_PROGRESS_ALLIANCE && m_captureState != CAPTURE_STATE_CONTEST_ALLIANCE) && m_captureSlider > CAPTURE_SLIDER_MIDDLE + neutralPercent * 0.5f && progressFaction == ALLIANCE) { eventId = info->capturePoint.progressEventID1; @@ -2477,7 +2477,7 @@ void GameObject::TickCapturePoint() m_captureState = CAPTURE_STATE_PROGRESS_ALLIANCE; } // horde takes the tower from neutral, contested or alliance (if there is no neutral area) to horde - else if (m_captureState != CAPTURE_STATE_PROGRESS_HORDE && m_captureSlider < CAPTURE_SLIDER_MIDDLE - neutralPercent * 0.5f && progressFaction == HORDE) + else if ((m_captureState != CAPTURE_STATE_PROGRESS_HORDE && m_captureState != CAPTURE_STATE_CONTEST_HORDE) && m_captureSlider < CAPTURE_SLIDER_MIDDLE - neutralPercent * 0.5f && progressFaction == HORDE) { eventId = info->capturePoint.progressEventID2;