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

Merge pull request #1465 from Masy98/blocks

Browse Source 
Added barriers correctly
This commit is contained in:
Mattes D 2014-09-27 22:01:55 +02:00
commit a3b140cb44
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ChunkMap.cpp
View File

@ -1888,6 +1888,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
case E_BLOCK_OBSIDIAN: case E_BLOCK_OBSIDIAN:
case E_BLOCK_BEACON: case E_BLOCK_BEACON:
case E_BLOCK_BEDROCK: case E_BLOCK_BEDROCK:
case E_BLOCK_BARRIER:
case E_BLOCK_WATER: case E_BLOCK_WATER:
case E_BLOCK_LAVA: case E_BLOCK_LAVA:
{ {

14
src/ClientHandle.cpp
View File

@ -1148,10 +1148,18 @@ void cClientHandle::HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_Blo
FinishDigAnimation(); FinishDigAnimation();
if (!m_Player->IsGameModeCreative() && (a_OldBlock == E_BLOCK_BEDROCK)) if (!m_Player->IsGameModeCreative())
{ {
Kick("You can't break a bedrock!"); if (a_OldBlock == E_BLOCK_BEDROCK)
return; {
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(); cWorld * World = m_Player->GetWorld();