flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into GrownBiomes

Browse Source
This commit is contained in:
Mattes D 2014-10-31 19:27:35 +01:00
commit 0dd804a591
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -12,7 +12,7 @@ Installation
For Linux there is an easy installation method, just run this in your terminal: For Linux there is an easy installation method, just run this in your terminal:
curl -s https://raw.github.com/mc-server/MCServer/master/easyinstall.sh | sh curl -s https://raw.githubusercontent.com/mc-server/MCServer/master/easyinstall.sh | sh
For Windows, you just need to download a file and extract it: For Windows, you just need to download a file and extract it:

6
src/Bindings/LuaState.h
View File

@ -247,7 +247,11 @@ public:
template <typename FnT, typename... Args> template <typename FnT, typename... Args>
bool Call(const FnT & a_Function, Args &&... 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...); return PushCallPop(args...);
} }

1
src/ChunkMap.cpp
View File

@ -822,6 +822,7 @@ void cChunkMap::WakeUpSimulatorsInArea(int a_MinBlockX, int a_MaxBlockX, int a_M
int MinChunkX, MinChunkZ, MaxChunkX, MaxChunkZ; int MinChunkX, MinChunkZ, MaxChunkX, MaxChunkZ;
cChunkDef::BlockToChunk(a_MinBlockX, a_MinBlockZ, MinChunkX, MinChunkZ); cChunkDef::BlockToChunk(a_MinBlockX, a_MinBlockZ, MinChunkX, MinChunkZ);
cChunkDef::BlockToChunk(a_MaxBlockX, a_MaxBlockZ, MaxChunkX, MaxChunkZ); cChunkDef::BlockToChunk(a_MaxBlockX, a_MaxBlockZ, MaxChunkX, MaxChunkZ);
cCSLock Lock(m_CSLayers);
for (int z = MinChunkZ; z <= MaxChunkZ; z++) for (int z = MinChunkZ; z <= MaxChunkZ; z++)
{ {
int MinZ = std::max(a_MinBlockZ, z * cChunkDef::Width); int MinZ = std::max(a_MinBlockZ, z * cChunkDef::Width);

2
src/ClientHandle.cpp
View File

@ -557,7 +557,7 @@ void cClientHandle::UnloadOutOfRangeChunks(void)
for (cChunkCoordsList::iterator itr = ChunksToRemove.begin(); itr != ChunksToRemove.end(); ++itr) for (cChunkCoordsList::iterator itr = ChunksToRemove.begin(); itr != ChunksToRemove.end(); ++itr)
{ {
m_Player->GetWorld()->RemoveChunkClient(itr->m_ChunkX, itr->m_ChunkZ, this); 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);
} }
} }