diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
| commit | 42aec6dac53dffa6afe072560a7e1d4986112538 (patch) | |
| tree | 0836426857391df1b6a83f6368a183f83ec9b104 /Minecraft.Client/ServerConnection.cpp | |
| parent | c9d58eeac7c72f0b3038e084667b4d89a6249fce (diff) | |
| parent | ef9b6fd500dfabd9463267b0dd9e29577eea8a2b (diff) | |
Merge branch 'main' into pr/win64-world-saves
# Conflicts:
# Minecraft.Client/MinecraftServer.cpp
# README.md
Diffstat (limited to 'Minecraft.Client/ServerConnection.cpp')
| -rw-r--r-- | Minecraft.Client/ServerConnection.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Minecraft.Client/ServerConnection.cpp b/Minecraft.Client/ServerConnection.cpp index 9880a8c6..21d77f22 100644 --- a/Minecraft.Client/ServerConnection.cpp +++ b/Minecraft.Client/ServerConnection.cpp @@ -96,14 +96,10 @@ void ServerConnection::tick() shared_ptr<ServerPlayer> serverPlayer = player->getPlayer(); if( serverPlayer ) { + serverPlayer->updateFrameTick(); serverPlayer->doChunkSendingTick(false); } -// try { // 4J - removed try/catch - player->tick(); -// } catch (Exception e) { -// logger.log(Level.WARNING, "Failed to handle packet: " + e, e); -// player.disconnect("Internal server error"); -// } + player->tick(); if (player->done) { players.erase(players.begin()+i); @@ -201,4 +197,9 @@ void ServerConnection::handleServerSettingsChanged(shared_ptr<ServerSettingsChan // playerconnection->setShowOnMaps(pMinecraft->options->GetGamertagSetting()); // } // } +} + +vector< shared_ptr<PlayerConnection> > * ServerConnection::getPlayers() +{ + return &players; }
\ No newline at end of file |