mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-07-26 11:47:07 +00:00
fix server.properties keep-inventory
This commit is contained in:
parent
abbe007492
commit
33e0ecac56
|
|
@ -2574,11 +2574,11 @@ void Player::restoreFrom(shared_ptr<Player> oldPlayer, bool restoreAll)
|
||||||
#if defined(MINECRAFT_SERVER_BUILD)
|
#if defined(MINECRAFT_SERVER_BUILD)
|
||||||
else if (oldPlayer->fk_hasDeathState)
|
else if (oldPlayer->fk_hasDeathState)
|
||||||
{
|
{
|
||||||
if (oldPlayer->fk_deathKeepInventory)
|
if (oldPlayer->fk_deathKeepInventory || level->getGameRules()->getBoolean(GameRules::RULE_KEEPINVENTORY))
|
||||||
{
|
{
|
||||||
inventory->replaceWith(oldPlayer->inventory);
|
inventory->replaceWith(oldPlayer->inventory);
|
||||||
}
|
}
|
||||||
if (oldPlayer->fk_deathKeepLevel)
|
if (oldPlayer->fk_deathKeepLevel || level->getGameRules()->getBoolean(GameRules::RULE_KEEPINVENTORY))
|
||||||
{
|
{
|
||||||
experienceLevel = oldPlayer->experienceLevel;
|
experienceLevel = oldPlayer->experienceLevel;
|
||||||
totalExperience = oldPlayer->totalExperience;
|
totalExperience = oldPlayer->totalExperience;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue