Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove AUTO_VAR macro and _toString function (#592)

Browse Source
This commit is contained in:
void_17
2026-03-06 02:11:18 +07:00
committed by GitHub
parent 7d6658fe5b
commit 55231bb8d3
294 changed files with 5067 additions and 5773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Minecraft.Client/PendingConnection.cpp
View File

@@ -105,15 +105,14 @@ void PendingConnection::sendPreLoginResponse()
StorageManager.GetSaveUniqueFilename(szUniqueMapName);
PlayerList *playerList = MinecraftServer::getInstance()->getPlayers();
for(AUTO_VAR(it, playerList->players.begin()); it != playerList->players.end(); ++it)
for(auto& player : playerList->players)
{
shared_ptr<ServerPlayer> player = *it;
// If the offline Xuid is invalid but the online one is not then that's guest which we should ignore
// If the online Xuid is invalid but the offline one is not then we are definitely an offline game so dont care about UGC
// PADDY - this is failing when a local player with chat restrictions joins an online game
if( player != NULL && player->connection->m_offlineXUID != INVALID_XUID && player->connection->m_onlineXUID != INVALID_XUID )
if( player != nullptr && player->connection->m_offlineXUID != INVALID_XUID && player->connection->m_onlineXUID != INVALID_XUID )
{
if( player->connection->m_friendsOnlyUGC )
{
@@ -175,9 +174,9 @@ void PendingConnection::handleLogin(shared_ptr<LoginPacket> packet)
{
bool nameTaken = false;
vector<shared_ptr<ServerPlayer> >& pl = server->getPlayers()->players;
for (unsigned int i = 0; i < pl.size(); i++)
for (const auto& i : pl)
{
if (pl[i] != NULL && pl[i]->name == name)
if (i != NULL && i->name == name)
{
nameTaken = true;
break;
@@ -201,7 +200,7 @@ void PendingConnection::handleLogin(shared_ptr<LoginPacket> packet)
//else
{
//4J - removed
#if 0
#if 0
new Thread() {
public void run() {
try {
@@ -258,7 +257,7 @@ void PendingConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason,
void PendingConnection::handleGetInfo(shared_ptr<GetInfoPacket> packet)
{
//try {
//String message = server->motd + "<22>" + server->players->getPlayerCount() + "<22>" + server->players->getMaxPlayers();
//String message = server->motd + "<22>" + server->players->getPlayerCount() + "<22>" + server->players->getMaxPlayers();
//connection->send(new DisconnectPacket(message));
connection->send(shared_ptr<DisconnectPacket>(new DisconnectPacket(DisconnectPacket::eDisconnect_ServerFull) ) );
connection->sendAndQuit();