Merge branch 'master' into Playerbot

src/server/game/Entities/Player/Player.cpp

@@ -587,8 +587,6 @@ bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo
     InitPrimaryProfessions();                               // to max set before any spell added
 
     // apply original stats mods before spell loading or item equipment that call before equip _RemoveStatsMods()
-    UpdateMaxHealth();                                      // Update max Health (for add bonus from stamina)
-    SetFullHealth();
     if (getPowerType() == POWER_MANA)
     {
         UpdateMaxPower(POWER_MANA);                         // Update max Mana (for add bonus from intellect)
@@ -686,6 +684,10 @@ bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo
     }
     // all item positions resolved
 
+    // ensure player starts with full health
+    UpdateAllStats();
+    SetFullHealth();
+
     CheckAllAchievementCriteria();
 
     return true;

src/server/game/Miscellaneous/Language.h

@@ -1241,6 +1241,7 @@ enum AcoreStrings
     LANG_OPVP_NA_CAPTURE_A              = 10026,
     LANG_OPVP_NA_LOSE_H                = 10027,
     LANG_OPVP_NA_LOSE_A                = 10028,
+    LANG_OPVP_NA_DEFENSELESS           = 10074,
     // opvp tf
     LANG_OPVP_TF_CAPTURE_H              = 10029,
     LANG_OPVP_TF_CAPTURE_A              = 10030,