diff options
author | Alexander Harkness <me@bearbin.net> | 2015-06-07 21:47:47 +0200 |
---|---|---|
committer | Alexander Harkness <me@bearbin.net> | 2015-06-07 21:47:47 +0200 |
commit | 2ea316b74664539744c3f32f7062df80cbd321b3 (patch) | |
tree | 57deef6f15be95c6f1f1e27186a9f7ea8a0e2cf6 /src/World.h | |
parent | Merge pull request #2210 from nounoursheureux/bucket-craft (diff) | |
parent | Revert "Chunk queue collapsing" (diff) | |
download | cuberite-2ea316b74664539744c3f32f7062df80cbd321b3.tar cuberite-2ea316b74664539744c3f32f7062df80cbd321b3.tar.gz cuberite-2ea316b74664539744c3f32f7062df80cbd321b3.tar.bz2 cuberite-2ea316b74664539744c3f32f7062df80cbd321b3.tar.lz cuberite-2ea316b74664539744c3f32f7062df80cbd321b3.tar.xz cuberite-2ea316b74664539744c3f32f7062df80cbd321b3.tar.zst cuberite-2ea316b74664539744c3f32f7062df80cbd321b3.zip |
Diffstat (limited to 'src/World.h')
-rw-r--r-- | src/World.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/World.h b/src/World.h index 078a25562..064b50165 100644 --- a/src/World.h +++ b/src/World.h @@ -231,6 +231,7 @@ public: void BroadcastChat (const cCompositeChat & a_Message, const cClientHandle * a_Exclude = nullptr); // tolua_end + void BroadcastChunkData (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer, const cClientHandle * a_Exclude = nullptr); void BroadcastCollectEntity (const cEntity & a_Pickup, const cPlayer & a_Player, const cClientHandle * a_Exclude = nullptr); void BroadcastDestroyEntity (const cEntity & a_Entity, const cClientHandle * a_Exclude = nullptr); void BroadcastEntityEffect (const cEntity & a_Entity, int a_EffectID, int a_Amplifier, short a_Duration, const cClientHandle * a_Exclude = nullptr); @@ -608,7 +609,6 @@ public: /** Calls the callback for the chunk specified, with ChunkMapCS locked; returns false if the chunk doesn't exist, otherwise returns the same value as the callback */ bool DoWithChunk(int a_ChunkX, int a_ChunkZ, cChunkCallback & a_Callback); - bool DoWithChunk(int a_ChunkX, int a_ChunkZ, std::function<bool(cChunk &)> a_Callback); /** Calls the callback for the chunk at the block position specified, with ChunkMapCS locked; returns false if the chunk doesn't exist, otherwise returns the same value as the callback **/ bool DoWithChunkAt(Vector3i a_BlockPos, std::function<bool(cChunk &)> a_Callback); |