summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-01-11 02:52:14 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-01-11 02:52:14 +0100
commit6b25ef4fa30d9b85188daad5bbb89b1d5c6f27e1 (patch)
tree7d2170f1e5085d54b2b59e9e3d567c59fb3f1666
parentRenamed g_TorchPlaceable... (diff)
downloadcuberite-6b25ef4fa30d9b85188daad5bbb89b1d5c6f27e1.tar
cuberite-6b25ef4fa30d9b85188daad5bbb89b1d5c6f27e1.tar.gz
cuberite-6b25ef4fa30d9b85188daad5bbb89b1d5c6f27e1.tar.bz2
cuberite-6b25ef4fa30d9b85188daad5bbb89b1d5c6f27e1.tar.lz
cuberite-6b25ef4fa30d9b85188daad5bbb89b1d5c6f27e1.tar.xz
cuberite-6b25ef4fa30d9b85188daad5bbb89b1d5c6f27e1.tar.zst
cuberite-6b25ef4fa30d9b85188daad5bbb89b1d5c6f27e1.zip
Diffstat (limited to '')
-rw-r--r--src/Simulator/RedstoneSimulator.h20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/Simulator/RedstoneSimulator.h b/src/Simulator/RedstoneSimulator.h
index 4fe8b59b3..1e92eccb4 100644
--- a/src/Simulator/RedstoneSimulator.h
+++ b/src/Simulator/RedstoneSimulator.h
@@ -158,25 +158,7 @@ private:
/* ====== Misc Functions ====== */
/** Returns if a block is viable to be the MiddleBlock of a SetLinkedPowered operation */
- inline static bool IsViableMiddleBlock(BLOCKTYPE Block)
- {
- if (!g_BlockIsSolid[Block]) { return false; }
-
- switch (Block)
- {
- // Add SOLID but not viable middle blocks here
- case E_BLOCK_PISTON:
- case E_BLOCK_PISTON_EXTENSION:
- case E_BLOCK_STICKY_PISTON:
- case E_BLOCK_REDSTONE_REPEATER_ON:
- case E_BLOCK_REDSTONE_REPEATER_OFF:
- case E_BLOCK_DAYLIGHT_SENSOR:
- {
- return false;
- }
- default: return true;
- }
- }
+ inline static bool IsViableMiddleBlock(BLOCKTYPE Block) { return g_BlockFullyOccupiesVoxel[Block]; }
/** Returns if a block is a mechanism (something that accepts power and does something) */
inline static bool IsMechanism(BLOCKTYPE Block)