1 files changed, 6 insertions, 0 deletions

diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index dda6a6ed2..ed76ee086 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -1287,6 +1287,12 @@ void cClientHandle::HandleTabCompletion(const AString & a_Text)
 
 void cClientHandle::SendData(const char * a_Data, int a_Size)
 {
+	if (m_HasSentDC)
+	{
+		// This could crash the client, because they've already unloaded the world etc., and suddenly a wild packet appears (#31)
+		return;
+	}
+	
 	{
 		cCSLock Lock(m_CSOutgoingData);