summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasy98 <masy@antheruscraft.de>2014-09-11 16:07:54 +0200
committerMasy98 <masy@antheruscraft.de>2014-09-11 16:07:54 +0200
commit741791ecfc784d5aa0c4e8de11a6f3e99d6cc39d (patch)
tree3f30ab8b4a2617585bb5a2723764f9c339ca965c
parentAdded 1.8 food to the food list (diff)
downloadcuberite-741791ecfc784d5aa0c4e8de11a6f3e99d6cc39d.tar
cuberite-741791ecfc784d5aa0c4e8de11a6f3e99d6cc39d.tar.gz
cuberite-741791ecfc784d5aa0c4e8de11a6f3e99d6cc39d.tar.bz2
cuberite-741791ecfc784d5aa0c4e8de11a6f3e99d6cc39d.tar.lz
cuberite-741791ecfc784d5aa0c4e8de11a6f3e99d6cc39d.tar.xz
cuberite-741791ecfc784d5aa0c4e8de11a6f3e99d6cc39d.tar.zst
cuberite-741791ecfc784d5aa0c4e8de11a6f3e99d6cc39d.zip
Diffstat (limited to '')
-rw-r--r--src/BlockID.h1
-rw-r--r--src/BlockInfo.cpp6
-rw-r--r--src/Blocks/BlockPiston.h1
3 files changed, 7 insertions, 1 deletions
diff --git a/src/BlockID.h b/src/BlockID.h
index 623b40b13..5f2ff15cc 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -176,6 +176,7 @@ enum ENUM_BLOCK_ID
E_BLOCK_ACACIA_WOOD_STAIRS = 163,
E_BLOCK_DARK_OAK_WOOD_STAIRS = 164,
E_BLOCK_SLIME_BLOCK = 165,
+ E_BLOCK_BARRIER = 166,
E_BLOCK_IRON_TRAPDOOR = 167,
E_BLOCK_PRISMARINE_BLOCK = 168,
E_BLOCK_SEA_LANTERN = 169,
diff --git a/src/BlockInfo.cpp b/src/BlockInfo.cpp
index adc112708..839f1e9f6 100644
--- a/src/BlockInfo.cpp
+++ b/src/BlockInfo.cpp
@@ -97,6 +97,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
a_Info[E_BLOCK_ACTIVE_COMPARATOR ].m_SpreadLightFalloff = 1;
a_Info[E_BLOCK_AIR ].m_SpreadLightFalloff = 1;
a_Info[E_BLOCK_ANVIL ].m_SpreadLightFalloff = 1;
+ a_Info[E_BLOCK_BARRIER ].m_SpreadLightFalloff = 1;
a_Info[E_BLOCK_BEACON ].m_SpreadLightFalloff = 1;
a_Info[E_BLOCK_BED ].m_SpreadLightFalloff = 1;
a_Info[E_BLOCK_BIG_FLOWER ].m_SpreadLightFalloff = 1;
@@ -211,6 +212,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
a_Info[E_BLOCK_ACTIVE_COMPARATOR ].m_Transparent = true;
a_Info[E_BLOCK_AIR ].m_Transparent = true;
a_Info[E_BLOCK_ANVIL ].m_Transparent = true;
+ a_Info[E_BLOCK_BARRIER ].m_Transparent = true;
a_Info[E_BLOCK_BEACON ].m_Transparent = true;
a_Info[E_BLOCK_BED ].m_Transparent = true;
a_Info[E_BLOCK_BIG_FLOWER ].m_Transparent = true;
@@ -527,7 +529,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
// Blocks that fully occupy their voxel - used as a guide for torch placeable blocks, amongst other things:
- a_Info[E_BLOCK_NEW_LOG ].m_FullyOccupiesVoxel = true;
+ a_Info[E_BLOCK_BARRIER ].m_FullyOccupiesVoxel = true;
a_Info[E_BLOCK_BEDROCK ].m_FullyOccupiesVoxel = true;
a_Info[E_BLOCK_BLOCK_OF_COAL ].m_FullyOccupiesVoxel = true;
a_Info[E_BLOCK_BLOCK_OF_REDSTONE ].m_FullyOccupiesVoxel = true;
@@ -572,6 +574,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
a_Info[E_BLOCK_NETHERRACK ].m_FullyOccupiesVoxel = true;
a_Info[E_BLOCK_NETHER_BRICK ].m_FullyOccupiesVoxel = true;
a_Info[E_BLOCK_NETHER_QUARTZ_ORE ].m_FullyOccupiesVoxel = true;
+ a_Info[E_BLOCK_NEW_LOG ].m_FullyOccupiesVoxel = true;
a_Info[E_BLOCK_NOTE_BLOCK ].m_FullyOccupiesVoxel = true;
a_Info[E_BLOCK_OBSIDIAN ].m_FullyOccupiesVoxel = true;
a_Info[E_BLOCK_PACKED_ICE ].m_FullyOccupiesVoxel = true;
@@ -774,6 +777,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
a_Info[E_BLOCK_ACACIA_WOOD_STAIRS ].m_PlaceSound = "dig.wood";
a_Info[E_BLOCK_DARK_OAK_WOOD_STAIRS ].m_PlaceSound = "dig.wood";
a_Info[E_BLOCK_SLIME_BLOCK ].m_PlaceSound = "dig.slime"; // I hope it is named slime, it's definetly a new sound type though...
+ a_Info[E_BLOCK_BARRIER ].m_PlaceSound = "dig.stone";
a_Info[E_BLOCK_IRON_TRAPDOOR ].m_PlaceSound = "dig.metal";
a_Info[E_BLOCK_PRISMARINE_BLOCK ].m_PlaceSound = "dig.stone";
a_Info[E_BLOCK_SEA_LANTERN ].m_PlaceSound = "dig.stone";
diff --git a/src/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h
index 0bec603e3..f20e8af36 100644
--- a/src/Blocks/BlockPiston.h
+++ b/src/Blocks/BlockPiston.h
@@ -94,6 +94,7 @@ private:
switch (a_BlockType)
{
case E_BLOCK_ANVIL:
+ case E_BLOCK_BARRIER:
case E_BLOCK_BEACON:
case E_BLOCK_BEDROCK:
case E_BLOCK_BREWING_STAND: