review changes

azerothcore · Mar 9, 2025 · bc25072 · bc25072
1 parent 0412232
commit bc25072
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
@@ -2473,7 +2473,10 @@ void Player::GiveXP(uint32 xp, Unit* victim, float group_rate, bool isLFGReward)
 void Player::GiveLevel(uint8 level)
 {
     uint8 oldLevel = GetLevel();
-    if (level == oldLevel || !sScriptMgr->OnPlayerCanChangeLevel(this, level))
+    if (level == oldLevel)
+        return;
+
+    if (!sScriptMgr->OnPlayerCanChangeLevel(this, level))
         return;
 
     if (Guild* guild = GetGuild())

diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp
@@ -915,9 +915,9 @@ bool ScriptMgr::OnPlayerCanResurrect(Player* player)
     CALL_ENABLED_BOOLEAN_HOOKS(PlayerScript, PLAYERHOOK_CAN_RESURRECT, !script->OnPlayerCanResurrect(player));
 }
 
-bool ScriptMgr::OnPlayerCanChangeLevel(Player* player, uint8 newLevel)
+bool ScriptMgr::OnPlayerCanGiveLevel(Player* player, uint8 newLevel)
 {
-    CALL_ENABLED_BOOLEAN_HOOKS(PlayerScript, PLAYERHOOK_ON_BEFORE_LEVEL_CHANGED, !script->OnPlayerCanChangeLevel(player, newLevel));
+    CALL_ENABLED_BOOLEAN_HOOKS(PlayerScript, PLAYERHOOK_ON_CAN_GIVE_LEVEL, !script->OnPlayerCanGiveLevel(player, newLevel));
 }
 
 PlayerScript::PlayerScript(const char* name, std::vector<uint16> enabledHooks)

diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.h b/src/server/game/Scripting/ScriptDefines/PlayerScript.h
@@ -208,7 +208,7 @@ enum PlayerHook
     PLAYERHOOK_ON_BEFORE_UPDATE_SKILL,
     PLAYERHOOK_ON_UPDATE_SKILL,
     PLAYERHOOK_CAN_RESURRECT,
-    PLAYERHOOK_ON_BEFORE_LEVEL_CHANGED,
+    PLAYERHOOK_ON_CAN_GIVE_LEVEL,
     PLAYERHOOK_END
 };
 
@@ -783,7 +783,7 @@ class PlayerScript : public ScriptObject
      * @return true if player is authorized to resurect
      */
     virtual bool OnPlayerCanResurrect(Player* /*player*/) { return true; }
-    virtual bool OnPlayerCanChangeLevel(Player* /*player*/, uint8 /*newLevel*/) { return true; }
+    virtual bool OnPlayerCanGiveLevel(Player* /*player*/, uint8 /*newLevel*/) { return true; }
 };
 
 #endif
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
@@ -463,7 +463,7 @@ class ScriptMgr
     void OnPlayerBeforeUpdateSkill(Player* player, uint32 skill_id, uint32& value, uint32 max, uint32 step);
     void OnPlayerUpdateSkill(Player* player, uint32 skillId, uint32 value, uint32 max, uint32 step, uint32 newValue);
     bool OnPlayerCanResurrect(Player* player);
-    bool OnPlayerCanChangeLevel(Player* player, uint8 newLevel);
+    bool OnPlayerCanGiveLevel(Player* player, uint8 newLevel);
 
     // Anti cheat
     void AnticheatSetCanFlybyServer(Player* player, bool apply);