diff options
| author | Mattes D <github@xoft.cz> | 2014-09-27 22:01:55 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-09-27 22:01:55 +0200 |
| commit | a3b140cb44ed93e6df8328c0372afec24c6872f5 (patch) | |
| tree | 2606040b6afe989a94beabbe1318d0487132afad /src | |
| parent | BioGen: TwoLevel is now fully settable in INI. (diff) | |
| parent | Combined conditions (diff) | |
| download | cuberite-a3b140cb44ed93e6df8328c0372afec24c6872f5.tar cuberite-a3b140cb44ed93e6df8328c0372afec24c6872f5.tar.gz cuberite-a3b140cb44ed93e6df8328c0372afec24c6872f5.tar.bz2 cuberite-a3b140cb44ed93e6df8328c0372afec24c6872f5.tar.lz cuberite-a3b140cb44ed93e6df8328c0372afec24c6872f5.tar.xz cuberite-a3b140cb44ed93e6df8328c0372afec24c6872f5.tar.zst cuberite-a3b140cb44ed93e6df8328c0372afec24c6872f5.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChunkMap.cpp | 1 | ||||
| -rw-r--r-- | src/ClientHandle.cpp | 14 |
2 files changed, 12 insertions, 3 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..3bd48eb3d 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -1148,10 +1148,18 @@ void cClientHandle::HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_Blo FinishDigAnimation(); - if (!m_Player->IsGameModeCreative() && (a_OldBlock == E_BLOCK_BEDROCK)) + if (!m_Player->IsGameModeCreative()) { - Kick("You can't break a bedrock!"); - return; + if (a_OldBlock == E_BLOCK_BEDROCK) + { + Kick("You can't break a bedrock!"); + return; + } + if (a_OldBlock == E_BLOCK_BARRIER) + { + Kick("You can't break a barrier!"); + return; + } } cWorld * World = m_Player->GetWorld(); |