From 68ad71090e51a3331bdcf9b26e282b2ea8d6d798 Mon Sep 17 00:00:00 2001
From: fallenoak <git@fallenoak.me>
Date: Fri, 6 Feb 2026 10:36:54 -0600
Subject: [PATCH] feat(object): simplify getters in CGPlayer_C

---
 src/object/client/CGPlayer_C.cpp | 8 ++++----
 src/object/client/CGPlayer_C.hpp | 4 ++--
 src/ui/game/ScriptEvents.cpp     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/object/client/CGPlayer_C.cpp b/src/object/client/CGPlayer_C.cpp
index 26b5aa3..87d6b1a 100644
--- a/src/object/client/CGPlayer_C.cpp
+++ b/src/object/client/CGPlayer_C.cpp
@@ -14,20 +14,20 @@ CGPlayer_C::~CGPlayer_C() {
     // TODO
 }
 
-uint32_t CGPlayer_C::GetActiveNextLevelXP() const {
+uint32_t CGPlayer_C::GetNextLevelXP() const {
     if (this->GetGUID() != ClntObjMgrGetActivePlayer()) {
         return 0;
     }
 
-    return this->GetNextLevelXP();
+    return this->CGPlayer::GetNextLevelXP();
 }
 
-uint32_t CGPlayer_C::GetActiveXP() const {
+uint32_t CGPlayer_C::GetXP() const {
     if (this->GetGUID() != ClntObjMgrGetActivePlayer()) {
         return 0;
     }
 
-    return this->GetXP();
+    return this->CGPlayer::GetXP();
 }
 
 void CGPlayer_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
diff --git a/src/object/client/CGPlayer_C.hpp b/src/object/client/CGPlayer_C.hpp
index 2af9cef..d58b7a0 100644
--- a/src/object/client/CGPlayer_C.hpp
+++ b/src/object/client/CGPlayer_C.hpp
@@ -15,8 +15,8 @@ class CGPlayer_C : public CGUnit_C, public CGPlayer {
 
         // Public member functions
         CGPlayer_C(uint32_t time, CClientObjCreate& objCreate);
-        uint32_t GetActiveNextLevelXP() const;
-        uint32_t GetActiveXP() const;
+        uint32_t GetNextLevelXP() const;
+        uint32_t GetXP() const;
         void PostInit(uint32_t time, const CClientObjCreate& init, bool a4);
         void PostInitActivePlayer();
         void SetStorage(uint32_t* storage, uint32_t* saved);
diff --git a/src/ui/game/ScriptEvents.cpp b/src/ui/game/ScriptEvents.cpp
index c3846a3..89d08bf 100644
--- a/src/ui/game/ScriptEvents.cpp
+++ b/src/ui/game/ScriptEvents.cpp
@@ -189,7 +189,7 @@ int32_t Script_UnitXP(lua_State* L) {
     float xp = 0.0f;
 
     if (unit && unit->IsA(TYPE_PLAYER)) {
-        xp = static_cast<CGPlayer_C*>(unit)->GetActiveXP();
+        xp = static_cast<CGPlayer_C*>(unit)->GetXP();
     }
 
     lua_pushnumber(L, xp);
@@ -209,7 +209,7 @@ int32_t Script_UnitXPMax(lua_State* L) {
     float xpMax = 0.0f;
 
     if (unit && unit->IsA(TYPE_PLAYER)) {
-        xpMax = static_cast<CGPlayer_C*>(unit)->GetActiveNextLevelXP();
+        xpMax = static_cast<CGPlayer_C*>(unit)->GetNextLevelXP();
     }
 
     lua_pushnumber(L, xpMax);