summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authortonibm19 <tonibm19@gmail.com>2013-12-24 19:13:18 +0100
committertonibm19 <tonibm19@gmail.com>2013-12-24 19:13:18 +0100
commite3f89400d8c4488aad905e4c5a163543bb3603ff (patch)
treede85ee6aa71d3ddb46039eda9c3649d81852c444 /src
parentUsing BLOCKTYPE instead of int (diff)
downloadcuberite-e3f89400d8c4488aad905e4c5a163543bb3603ff.tar
cuberite-e3f89400d8c4488aad905e4c5a163543bb3603ff.tar.gz
cuberite-e3f89400d8c4488aad905e4c5a163543bb3603ff.tar.bz2
cuberite-e3f89400d8c4488aad905e4c5a163543bb3603ff.tar.lz
cuberite-e3f89400d8c4488aad905e4c5a163543bb3603ff.tar.xz
cuberite-e3f89400d8c4488aad905e4c5a163543bb3603ff.tar.zst
cuberite-e3f89400d8c4488aad905e4c5a163543bb3603ff.zip
Diffstat (limited to 'src')
-rw-r--r--src/Blocks/BlockPumpkin.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/Blocks/BlockPumpkin.h b/src/Blocks/BlockPumpkin.h
index 1ddc1ed1f..3fbe76f8c 100644
--- a/src/Blocks/BlockPumpkin.h
+++ b/src/Blocks/BlockPumpkin.h
@@ -22,9 +22,10 @@ public:
BLOCKTYPE BlockY2 = a_World->GetBlock(a_BlockX, a_BlockY - 2, a_BlockZ); // We don't need to check this 2 blocks more than 1 time.
if
(
- (BlockY1 == E_BLOCK_SNOW_BLOCK) && // If the first two blocks below the pumpkin are snow blocks, spawn a snow golem.
- (BlockY2 == E_BLOCK_SNOW_BLOCK)
+ return;
)
+ (BlockY1 == E_BLOCK_SNOW_BLOCK) && // If the first two blocks below the pumpkin are snow blocks, spawn a snow golem.
+ (BlockY2 == E_BLOCK_SNOW_BLOCK)
{
a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
a_World->FastSetBlock(a_BlockX, a_BlockY - 1, a_BlockZ, E_BLOCK_AIR, 0);
@@ -33,15 +34,17 @@ public:
}
else if
(
+ return;
+ )
(BlockY1 == E_BLOCK_IRON_BLOCK) && // If the first two blocks below the pumpkin are iron blocks, spawn an iron golem.
(BlockY2 == E_BLOCK_IRON_BLOCK)
- )
{
if
(
- (a_World->GetBlock(a_BlockX + 1, a_BlockY - 1, a_BlockZ) == E_BLOCK_IRON_BLOCK) && // Check the first possible locations for arms.
- (a_World->GetBlock(a_BlockX - 1, a_BlockY - 1, a_BlockZ) == E_BLOCK_IRON_BLOCK)
+ return;
)
+ (a_World->GetBlock(a_BlockX + 1, a_BlockY - 1, a_BlockZ) == E_BLOCK_IRON_BLOCK) && // Check the first possible locations for arms.
+ (a_World->GetBlock(a_BlockX - 1, a_BlockY - 1, a_BlockZ) == E_BLOCK_IRON_BLOCK)
{
a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
a_World->FastSetBlock(a_BlockX, a_BlockY - 1, a_BlockZ, E_BLOCK_AIR, 0);
@@ -52,9 +55,10 @@ public:
}
else if
(
- (a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ + 1) == E_BLOCK_IRON_BLOCK) && // Check the other possible locations.
- (a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ - 1) == E_BLOCK_IRON_BLOCK)
+ return;
)
+ (a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ + 1) == E_BLOCK_IRON_BLOCK) && // Check the other possible locations.
+ (a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ - 1) == E_BLOCK_IRON_BLOCK)
{
a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
a_World->FastSetBlock(a_BlockX, a_BlockY - 1, a_BlockZ, E_BLOCK_AIR, 0);