Merge pull request #718 from eqcodex/master

added minimum level to pvp flag.
This commit is contained in:
Michael Cook (mackal)
2018-02-26 13:04:02 -05:00
committed by GitHub
3 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -254,7 +254,7 @@ Client::Client(EQStreamInterface* ieqs)
mercSlot = 0;
InitializeMercInfo();
SetMerc(0);
if (RuleI(World, PVPMinLevel) > 0 && level >= RuleI(World, PVPMinLevel) && m_pp.pvp == 0) SetPVP(true, false);
logging_enabled = CLIENT_DEFAULT_LOGGING_ENABLED;
//for good measure:
+2
View File
@@ -831,6 +831,8 @@ void Client::SetLevel(uint8 set_level, bool command)
SetHP(CalcMaxHP()); // Why not, lets give them a free heal
}
if (RuleI(World, PVPMinLevel) > 0 && level >= RuleI(World, PVPMinLevel) && m_pp.pvp == 0) SetPVP(true);
DoTributeUpdate();
SendHPUpdate();
SetMana(CalcMaxMana());