diff --git a/Minecraft.Client/ClientConnection.cpp b/Minecraft.Client/ClientConnection.cpp index ba40b43ee..0cd4ebb8c 100644 --- a/Minecraft.Client/ClientConnection.cpp +++ b/Minecraft.Client/ClientConnection.cpp @@ -2427,6 +2427,7 @@ void ClientConnection::handleAddMob(shared_ptr packet) float xRot = packet->xRot * 360 / 256.0f; shared_ptr mob = dynamic_pointer_cast(EntityIO::newById(packet->type, level)); + if (mob == nullptr) return; mob->xp = packet->x; mob->yp = packet->y; mob->zp = packet->z; diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp index 0147896ca..a69084917 100644 --- a/Minecraft.Client/Extrax64Stubs.cpp +++ b/Minecraft.Client/Extrax64Stubs.cpp @@ -299,11 +299,7 @@ IQNetPlayer* IQNet::GetLocalPlayerByUserIndex(DWORD dwUserIndex) } return nullptr; } - // Split-screen pads 1-3: the player is at m_player[dwUserIndex] with isRemote=false - if (dwUserIndex < MINECRAFT_NET_MAX_PLAYERS && - !m_player[dwUserIndex].m_isRemote && - Win64_IsActivePlayer(&m_player[dwUserIndex], dwUserIndex)) - return &m_player[dwUserIndex]; + // Split-screen pads 1-3 only work in hosting mode return nullptr; } static bool Win64_IsActivePlayer(IQNetPlayer * p, DWORD index)