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

Added checks to bail out if block entities are being pushed by a piston

Browse Source
This commit is contained in:
Tiger Wang 2013-08-18 15:04:38 +01:00
parent 8a3174164b
commit fbbf12f3a6
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/Piston.cpp
View File

@ -62,7 +62,18 @@ unsigned short cPiston::FirstPassthroughBlock(int pistonX, int pistonY, int pist
{ {
AddDir( pistonX, pistonY, pistonZ, pistonmeta, 1) //Set the coords one further from the piston direction AddDir( pistonX, pistonY, pistonZ, pistonmeta, 1) //Set the coords one further from the piston direction
m_World->GetBlockTypeMeta(pistonX, pistonY, pistonZ, currBlock, currMeta); m_World->GetBlockTypeMeta(pistonX, pistonY, pistonZ, currBlock, currMeta);
if ((currBlock == E_BLOCK_BEDROCK) || (currBlock == E_BLOCK_OBSIDIAN) || (currBlock == E_BLOCK_PISTON_EXTENSION) || ( (currMeta & 0x8) != 0x0 )) if ((currBlock == E_BLOCK_BEDROCK) ||
(currBlock == E_BLOCK_OBSIDIAN) ||
(currBlock == E_BLOCK_PISTON_EXTENSION) ||
( (currMeta & 0x8) != 0x0 ) || //Seems to include signs as well
(currBlock == E_BLOCK_CHEST) ||
(currBlock == E_BLOCK_DISPENSER) ||
(currBlock == E_BLOCK_DROPPER) ||
(currBlock == E_BLOCK_FURNACE) ||
(currBlock == E_BLOCK_LIT_FURNACE) ||
(currBlock == E_BLOCK_HOPPER) ||
(currBlock == E_BLOCK_JUKEBOX) ||
(currBlock == E_BLOCK_NOTE_BLOCK))
{ {
return 9001; return 9001;
} }
@ -187,7 +198,15 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
(tempblock == E_BLOCK_BEDROCK) || (tempblock == E_BLOCK_BEDROCK) ||
(tempblock == E_BLOCK_PISTON_EXTENSION) || (tempblock == E_BLOCK_PISTON_EXTENSION) ||
(g_BlockPistonBreakable[tempblock]) || (g_BlockPistonBreakable[tempblock]) ||
((tempmeta & 0x8) != 0x0 ) ( (tempmeta & 0x8) != 0x0 ) || //Seems to include signs as well
(tempblock == E_BLOCK_CHEST) ||
(tempblock == E_BLOCK_DISPENSER) ||
(tempblock == E_BLOCK_DROPPER) ||
(tempblock == E_BLOCK_FURNACE) ||
(tempblock == E_BLOCK_LIT_FURNACE) ||
(tempblock == E_BLOCK_HOPPER) ||
(tempblock == E_BLOCK_JUKEBOX) ||
(tempblock == E_BLOCK_NOTE_BLOCK)
) )
{ {
// These cannot be moved by the sticky piston, bail out // These cannot be moved by the sticky piston, bail out