summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--source/ChunkMap.h3
-rw-r--r--source/ClientHandle.cpp12
-rw-r--r--source/World.cpp12
-rw-r--r--source/World.h13
4 files changed, 39 insertions, 1 deletions
diff --git a/source/ChunkMap.h b/source/ChunkMap.h
index 1af26c39a..f8f03e063 100644
--- a/source/ChunkMap.h
+++ b/source/ChunkMap.h
@@ -298,6 +298,9 @@ public:
/// Queues the specified block for ticking (block update)
void QueueTickBlock(int a_BlockX, int a_BlockY, int a_BlockZ);
+
+ /// Returns the CS for locking the chunkmap; only cWorld::cLock may use this function!
+ cCriticalSection & GetCS(void) { return m_CSLayers; }
private:
diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index d0904bfb0..9d5bbaeaf 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -1957,7 +1957,17 @@ void cClientHandle::PacketError(unsigned char a_PacketType)
void cClientHandle::DataReceived(const char * a_Data, int a_Size)
{
// Data is received from the client, hand it off to the protocol:
- m_Protocol->DataReceived(a_Data, a_Size);
+ if ((m_Player != NULL) && (m_Player->GetWorld() != NULL))
+ {
+ // Lock the world, so that plugins reacting to protocol events have already the chunkmap locked
+ cWorld::cLock(*m_Player->GetWorld());
+
+ m_Protocol->DataReceived(a_Data, a_Size);
+ }
+ else
+ {
+ m_Protocol->DataReceived(a_Data, a_Size);
+ }
m_TimeSinceLastPacket = 0;
}
diff --git a/source/World.cpp b/source/World.cpp
index 36fb08702..f9da43ed2 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -173,6 +173,18 @@ protected:
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cWorld::cLock:
+
+cWorld::cLock::cLock(cWorld & a_World) :
+ super(&(a_World.m_ChunkMap->GetCS()))
+{
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cWorld:
cWorld::cWorld(const AString & a_WorldName) :
diff --git a/source/World.h b/source/World.h
index 21869bd41..fe339ea61 100644
--- a/source/World.h
+++ b/source/World.h
@@ -66,6 +66,19 @@ public:
dimEnd = 1,
} ;
+ // tolua_end
+
+ /// A simple RAII locker for the chunkmap - locks the chunkmap in its constructor, unlocks it in the destructor
+ class cLock :
+ public cCSLock
+ {
+ typedef cCSLock super;
+ public:
+ cLock(cWorld & a_World);
+ } ;
+
+ // tolua_begin
+
static const char * GetClassStatic(void)
{
return "cWorld";