summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMasy98 <masy@antheruscraft.de>2014-09-27 21:07:52 +0200
committerMasy98 <masy@antheruscraft.de>2014-09-27 21:07:52 +0200
commitfc22ba0ce89b12b13bca00f5005f96528d1c91ae (patch)
tree66fb96ce364cb114745cae992de7e91b88dadd31 /src
parentAdded default value to switch and spruce gate to fence gate handler (diff)
downloadcuberite-fc22ba0ce89b12b13bca00f5005f96528d1c91ae.tar
cuberite-fc22ba0ce89b12b13bca00f5005f96528d1c91ae.tar.gz
cuberite-fc22ba0ce89b12b13bca00f5005f96528d1c91ae.tar.bz2
cuberite-fc22ba0ce89b12b13bca00f5005f96528d1c91ae.tar.lz
cuberite-fc22ba0ce89b12b13bca00f5005f96528d1c91ae.tar.xz
cuberite-fc22ba0ce89b12b13bca00f5005f96528d1c91ae.tar.zst
cuberite-fc22ba0ce89b12b13bca00f5005f96528d1c91ae.zip
Diffstat (limited to 'src')
-rw-r--r--src/ChunkMap.cpp1
-rw-r--r--src/ClientHandle.cpp5
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 38a7d9bd4..299fe0eca 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1888,6 +1888,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
case E_BLOCK_OBSIDIAN:
case E_BLOCK_BEACON:
case E_BLOCK_BEDROCK:
+ case E_BLOCK_BARRIER:
case E_BLOCK_WATER:
case E_BLOCK_LAVA:
{
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 878d309c9..52ea59884 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1153,6 +1153,11 @@ void cClientHandle::HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_Blo
Kick("You can't break a bedrock!");
return;
}
+ if (!m_Player->IsGameModeCreative() && (a_OldBlock == E_BLOCK_BARRIER))
+ {
+ Kick("You can't break a barrier!");
+ return;
+ }
cWorld * World = m_Player->GetWorld();
cItemHandler * ItemHandler = cItemHandler::GetItemHandler(m_Player->GetEquippedItem());