Merge branch 'main' into TU43
This commit is contained in:
@@ -37,6 +37,8 @@
|
||||
#include "Common/Network/Sony/NetworkPlayerSony.h"
|
||||
#endif
|
||||
|
||||
#include "../Minecraft.World/Recipes.h"
|
||||
|
||||
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
|
||||
#include "../Minecraft.Server/Access/Access.h"
|
||||
#include "../Minecraft.Server/Common/StringUtils.h"
|
||||
@@ -51,6 +53,7 @@ extern bool g_Win64DedicatedServer;
|
||||
static unsigned int s_playerListTickCount = 0;
|
||||
static const int kIdentityResponseGraceTicks = 200; // 10 seconds at 20 TPS
|
||||
#endif
|
||||
#include "../Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h"
|
||||
|
||||
// 4J - this class is fairly substantially altered as there didn't seem any point in porting code for banning, whitelisting, ops etc.
|
||||
|
||||
@@ -300,6 +303,9 @@ bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
|
||||
app.DebugPrintf("RECONNECT: placeNewPlayer smallId=%d entityId=%d dim=%d\n",
|
||||
newSmallId, player->entityId, level->dimension->id);
|
||||
|
||||
playerConnection->send(Recipes::getInstance()->createUpdatePacket());
|
||||
playerConnection->send(IUIScene_CreativeMenu::createUpdatePacket());
|
||||
|
||||
playerConnection->send(std::make_shared<LoginPacket>(L"", player->entityId, level->getLevelData()->getGenerator(),
|
||||
level->getSeed(),
|
||||
player->gameMode->getGameModeForPlayer()->getId(),
|
||||
|
||||
Reference in New Issue
Block a user