From c9224b09e91089d28ac8056dd3707dc99193d298 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 20 Oct 2012 10:36:50 +0000 Subject: PACKET_DESTROY_ENTITY isn't sent for self when the player is kicked (FS #254) git-svn-id: http://mc-server.googlecode.com/svn/trunk@985 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Protocol/Protocol132.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp index d61ca4543..0a2e7d0c9 100644 --- a/source/Protocol/Protocol132.cpp +++ b/source/Protocol/Protocol132.cpp @@ -271,6 +271,12 @@ void cProtocol132::SendCollectPickup(const cPickup & a_Pickup, const cPlayer & a void cProtocol132::SendDestroyEntity(const cEntity & a_Entity) { + if (a_Entity.GetUniqueID() == m_Client->GetPlayer()->GetUniqueID()) + { + // Do not send "destroy self" to the client, the client would crash (FS #254) + return; + } + cCSLock Lock(m_CSPacket); WriteByte(PACKET_DESTROY_ENTITIES); WriteByte(1); // entity count -- cgit v1.2.3