From 4311f4a658fe2bef362aeb9b4bdbcd59c9617ad6 Mon Sep 17 00:00:00 2001 From: mathiascode Date: Tue, 14 Feb 2017 12:13:55 +0200 Subject: Added some blocks and items (#3503) --- src/Simulator/FluidSimulator.cpp | 1 + src/Simulator/SandSimulator.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) (limited to 'src/Simulator') diff --git a/src/Simulator/FluidSimulator.cpp b/src/Simulator/FluidSimulator.cpp index fce5e64b9..a1b14044b 100644 --- a/src/Simulator/FluidSimulator.cpp +++ b/src/Simulator/FluidSimulator.cpp @@ -31,6 +31,7 @@ bool cFluidSimulator::CanWashAway(BLOCKTYPE a_BlockType) { switch (a_BlockType) { + case E_BLOCK_BEETROOTS: case E_BLOCK_BROWN_MUSHROOM: case E_BLOCK_CACTUS: case E_BLOCK_COBWEB: diff --git a/src/Simulator/SandSimulator.cpp b/src/Simulator/SandSimulator.cpp index d3773ee41..59990cea3 100644 --- a/src/Simulator/SandSimulator.cpp +++ b/src/Simulator/SandSimulator.cpp @@ -153,7 +153,9 @@ bool cSandSimulator::CanContinueFallThrough(BLOCKTYPE a_BlockType) switch (a_BlockType) { case E_BLOCK_AIR: + case E_BLOCK_BEETROOTS: case E_BLOCK_BROWN_MUSHROOM: + case E_BLOCK_CARROTS: case E_BLOCK_COBWEB: case E_BLOCK_CROPS: case E_BLOCK_DEAD_BUSH: @@ -178,6 +180,7 @@ bool cSandSimulator::CanContinueFallThrough(BLOCKTYPE a_BlockType) case E_BLOCK_RED_ROSE: case E_BLOCK_SIGN_POST: case E_BLOCK_SNOW: + case E_BLOCK_STANDING_BANNER: case E_BLOCK_STATIONARY_LAVA: case E_BLOCK_STATIONARY_WATER: case E_BLOCK_STONE_BUTTON: @@ -187,6 +190,7 @@ bool cSandSimulator::CanContinueFallThrough(BLOCKTYPE a_BlockType) case E_BLOCK_TRAPDOOR: case E_BLOCK_TRIPWIRE: case E_BLOCK_TRIPWIRE_HOOK: + case E_BLOCK_WALL_BANNER: case E_BLOCK_WALLSIGN: case E_BLOCK_WATER: case E_BLOCK_WOODEN_BUTTON: @@ -209,12 +213,15 @@ bool cSandSimulator::IsReplacedOnRematerialization(BLOCKTYPE a_BlockType) switch (a_BlockType) { case E_BLOCK_AIR: + case E_BLOCK_CHORUS_FLOWER: + case E_BLOCK_CHORUS_PLANT: case E_BLOCK_DEAD_BUSH: case E_BLOCK_FIRE: case E_BLOCK_LAVA: case E_BLOCK_SNOW: case E_BLOCK_STATIONARY_LAVA: case E_BLOCK_STATIONARY_WATER: + case E_BLOCK_STRUCTURE_VOID: case E_BLOCK_TALL_GRASS: case E_BLOCK_WATER: { @@ -232,6 +239,8 @@ bool cSandSimulator::DoesBreakFallingThrough(BLOCKTYPE a_BlockType, NIBBLETYPE a { switch (a_BlockType) { + case E_BLOCK_PURPUR_SLAB: + case E_BLOCK_RED_SANDSTONE_SLAB: case E_BLOCK_STONE_SLAB: case E_BLOCK_WOODEN_SLAB: { -- cgit v1.2.3