Merge branch 'main' into upstream-merge

This commit is contained in:
/home/neo
2026-04-15 12:10:41 +03:00
committed by GitHub
4 changed files with 35 additions and 26 deletions

View File

@@ -215,7 +215,7 @@ bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
int centreZC = 0;
#endif
// 4J Added - Give every player a map the first time they join a server
player->inventory->setItem( 9, std::make_shared<ItemInstance>(Item::map_Id, 1, level->getAuxValueForMap(player->getXuid(), 0, centreXC, centreZC, mapScale)));
player->inventory->setItem( 9, std::make_shared<ItemInstance>(Item::emptyMap_Id, 1, level->getAuxValueForMap(player->getXuid(), 0, centreXC, centreZC, mapScale)));
if(app.getGameRuleDefinitions() != nullptr)
{
app.getGameRuleDefinitions()->postProcessPlayer(player);