summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBond-009 <Bond-009@users.noreply.github.com>2017-03-21 09:47:03 +0100
committerMattes D <github@xoft.cz>2017-03-21 09:47:03 +0100
commit76c39dad0fc7ab13b72f352195995537548a47ab (patch)
treeb140353b70c7dc4ff2a15dc8fa9e04744c46c432 /src
parentReturn bowl when eating beetroot soup (diff)
downloadcuberite-76c39dad0fc7ab13b72f352195995537548a47ab.tar
cuberite-76c39dad0fc7ab13b72f352195995537548a47ab.tar.gz
cuberite-76c39dad0fc7ab13b72f352195995537548a47ab.tar.bz2
cuberite-76c39dad0fc7ab13b72f352195995537548a47ab.tar.lz
cuberite-76c39dad0fc7ab13b72f352195995537548a47ab.tar.xz
cuberite-76c39dad0fc7ab13b72f352195995537548a47ab.tar.zst
cuberite-76c39dad0fc7ab13b72f352195995537548a47ab.zip
Diffstat (limited to '')
-rw-r--r--src/BlockInfo.cpp1
-rw-r--r--src/Simulator/FluidSimulator.cpp10
2 files changed, 11 insertions, 0 deletions
diff --git a/src/BlockInfo.cpp b/src/BlockInfo.cpp
index fc739a60d..336f5a1e8 100644
--- a/src/BlockInfo.cpp
+++ b/src/BlockInfo.cpp
@@ -338,6 +338,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
a_Info[E_BLOCK_TNT ].m_OneHitDig = true;
a_Info[E_BLOCK_TALL_GRASS ].m_OneHitDig = true;
a_Info[E_BLOCK_TORCH ].m_OneHitDig = true;
+ a_Info[E_BLOCK_TRIPWIRE_HOOK ].m_OneHitDig = true;
a_Info[E_BLOCK_TRIPWIRE ].m_OneHitDig = true;
diff --git a/src/Simulator/FluidSimulator.cpp b/src/Simulator/FluidSimulator.cpp
index a1b14044b..10f2ed544 100644
--- a/src/Simulator/FluidSimulator.cpp
+++ b/src/Simulator/FluidSimulator.cpp
@@ -31,14 +31,22 @@ bool cFluidSimulator::CanWashAway(BLOCKTYPE a_BlockType)
{
switch (a_BlockType)
{
+ case E_BLOCK_ACTIVATOR_RAIL:
+ case E_BLOCK_ACTIVE_COMPARATOR:
case E_BLOCK_BEETROOTS:
+ case E_BLOCK_BIG_FLOWER:
case E_BLOCK_BROWN_MUSHROOM:
case E_BLOCK_CACTUS:
case E_BLOCK_COBWEB:
case E_BLOCK_CROPS:
case E_BLOCK_DEAD_BUSH:
+ case E_BLOCK_DETECTOR_RAIL:
+ case E_BLOCK_INACTIVE_COMPARATOR:
case E_BLOCK_LILY_PAD:
+ case E_BLOCK_POWERED_RAIL:
case E_BLOCK_RAIL:
+ case E_BLOCK_REDSTONE_REPEATER_OFF:
+ case E_BLOCK_REDSTONE_REPEATER_ON:
case E_BLOCK_REDSTONE_TORCH_OFF:
case E_BLOCK_REDSTONE_TORCH_ON:
case E_BLOCK_REDSTONE_WIRE:
@@ -48,6 +56,8 @@ bool cFluidSimulator::CanWashAway(BLOCKTYPE a_BlockType)
case E_BLOCK_SUGARCANE:
case E_BLOCK_TALL_GRASS:
case E_BLOCK_TORCH:
+ case E_BLOCK_TRIPWIRE_HOOK:
+ case E_BLOCK_TRIPWIRE:
case E_BLOCK_YELLOW_FLOWER:
{
return true;