From 552e8fa87f30d57bdd801d385bd73026f4ba0178 Mon Sep 17 00:00:00 2001 From: Goodlyay Date: Thu, 29 Feb 2024 23:32:13 -0800 Subject: [PATCH] Don't immediately process player movement after teleports --- MCGalaxy/Network/ClassicProtocol.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MCGalaxy/Network/ClassicProtocol.cs b/MCGalaxy/Network/ClassicProtocol.cs index 4ce4ea877..a5ee6bdd0 100644 --- a/MCGalaxy/Network/ClassicProtocol.cs +++ b/MCGalaxy/Network/ClassicProtocol.cs @@ -389,8 +389,9 @@ void SendTeleportCore(bool absoluteSelf, byte[] packet, byte id, Position pos, O Buffer.BlockCopy(pingPacket, 0, merged, packet.Length, pingPacket.Length); Send(merged); - //Update server-side position and check MB/portals/zones - player.ProcessMovementCore(pos, rot.RotY, rot.HeadX, false); + // This shouldn't be called -- checking blocks can trigger other teleports leading to a stack overflow + // Update server-side position and check MB/portals/zones + // player.ProcessMovementCore(pos, rot.RotY, rot.HeadX, false); } public override void SendRemoveEntity(byte id) {