diff options
| author | Mattes D <github@xoft.cz> | 2014-10-31 19:27:35 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-10-31 19:27:35 +0100 |
| commit | 0dd804a59120ce495224f98a0acabc69c6924b08 (patch) | |
| tree | 9669c462a28a40229b6b2690d7e1613dfe7392c7 /src | |
| parent | GrownProt biomes: added alterations. (diff) | |
| parent | cLuaState: Fixed errors on non-existent callbacks. (diff) | |
| download | cuberite-0dd804a59120ce495224f98a0acabc69c6924b08.tar cuberite-0dd804a59120ce495224f98a0acabc69c6924b08.tar.gz cuberite-0dd804a59120ce495224f98a0acabc69c6924b08.tar.bz2 cuberite-0dd804a59120ce495224f98a0acabc69c6924b08.tar.lz cuberite-0dd804a59120ce495224f98a0acabc69c6924b08.tar.xz cuberite-0dd804a59120ce495224f98a0acabc69c6924b08.tar.zst cuberite-0dd804a59120ce495224f98a0acabc69c6924b08.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Bindings/LuaState.h | 6 | ||||
| -rw-r--r-- | src/ChunkMap.cpp | 1 | ||||
| -rw-r--r-- | src/ClientHandle.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h index d1e9923b4..c13e36188 100644 --- a/src/Bindings/LuaState.h +++ b/src/Bindings/LuaState.h @@ -247,7 +247,11 @@ public: template <typename FnT, typename... Args> bool Call(const FnT & a_Function, Args &&... args) { - PushFunction(a_Function); + if (!PushFunction(a_Function)) + { + // Pushing the function failed + return false; + } return PushCallPop(args...); } diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp index 595040a54..8a8f17a1b 100644 --- a/src/ChunkMap.cpp +++ b/src/ChunkMap.cpp @@ -822,6 +822,7 @@ void cChunkMap::WakeUpSimulatorsInArea(int a_MinBlockX, int a_MaxBlockX, int a_M int MinChunkX, MinChunkZ, MaxChunkX, MaxChunkZ; cChunkDef::BlockToChunk(a_MinBlockX, a_MinBlockZ, MinChunkX, MinChunkZ); cChunkDef::BlockToChunk(a_MaxBlockX, a_MaxBlockZ, MaxChunkX, MaxChunkZ); + cCSLock Lock(m_CSLayers); for (int z = MinChunkZ; z <= MaxChunkZ; z++) { int MinZ = std::max(a_MinBlockZ, z * cChunkDef::Width); diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index faee05450..94bace43a 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -557,7 +557,7 @@ void cClientHandle::UnloadOutOfRangeChunks(void) for (cChunkCoordsList::iterator itr = ChunksToRemove.begin(); itr != ChunksToRemove.end(); ++itr) { m_Player->GetWorld()->RemoveChunkClient(itr->m_ChunkX, itr->m_ChunkZ, this); - m_Protocol->SendUnloadChunk(itr->m_ChunkX, itr->m_ChunkZ); + SendUnloadChunk(itr->m_ChunkX, itr->m_ChunkZ); } } |