aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/ServerConnection.cpp
diff options
context:
space:
mode:
authordaoge <3523206925@qq.com>2026-03-03 03:04:10 +0800
committerGitHub <noreply@github.com>2026-03-03 03:04:10 +0800
commitb3feddfef372618c8a9d7a0abcaf18cfad866c18 (patch)
tree267761c3bb39241ba5c347bfbe2254d06686e287 /Minecraft.Client/ServerConnection.cpp
parent84c31a2331f7a0ec85b9d438992e244f60e5020f (diff)
feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
Diffstat (limited to 'Minecraft.Client/ServerConnection.cpp')
-rw-r--r--Minecraft.Client/ServerConnection.cpp13
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