summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockNetherWart.h
diff options
context:
space:
mode:
authorSamuel Barney <samjbarney@gmail.com>2015-08-19 19:05:30 +0200
committerSamuel Barney <samjbarney@gmail.com>2015-08-19 19:05:30 +0200
commitb5ed23d2a6696586b70b11a1bed51f4565079e5d (patch)
treed4c4ebe5a88eaeba8ce9d53122c9eb92e297870c /src/Blocks/BlockNetherWart.h
parentMerge pull request #2439 from cuberite/AppveyorYml (diff)
parent* Logic for handling plant growth has been centralized into cBlockPlant, and all growable plants now inherit from it. (diff)
downloadcuberite-b5ed23d2a6696586b70b11a1bed51f4565079e5d.tar
cuberite-b5ed23d2a6696586b70b11a1bed51f4565079e5d.tar.gz
cuberite-b5ed23d2a6696586b70b11a1bed51f4565079e5d.tar.bz2
cuberite-b5ed23d2a6696586b70b11a1bed51f4565079e5d.tar.lz
cuberite-b5ed23d2a6696586b70b11a1bed51f4565079e5d.tar.xz
cuberite-b5ed23d2a6696586b70b11a1bed51f4565079e5d.tar.zst
cuberite-b5ed23d2a6696586b70b11a1bed51f4565079e5d.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockNetherWart.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Blocks/BlockNetherWart.h b/src/Blocks/BlockNetherWart.h
index 6a76e0828..b10150a92 100644
--- a/src/Blocks/BlockNetherWart.h
+++ b/src/Blocks/BlockNetherWart.h
@@ -1,7 +1,7 @@
#pragma once
-#include "BlockHandler.h"
+#include "BlockPlant.h"
#include "../FastRandom.h"
#include "../World.h"
@@ -10,11 +10,12 @@
class cBlockNetherWartHandler :
- public cBlockHandler
+ public cBlockPlant
{
+ typedef cBlockPlant Super;
public:
cBlockNetherWartHandler(BLOCKTYPE a_BlockType)
- : cBlockHandler(a_BlockType)
+ : Super(a_BlockType, false)
{
}
@@ -36,7 +37,7 @@ public:
virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
{
NIBBLETYPE Meta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ);
- if (Meta < 7)
+ if ((Meta < 7) && (CanGrow(a_Chunk, a_RelX, a_RelY, a_RelZ) == paGrowth))
{
a_Chunk.FastSetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_NETHER_WART, ++Meta);
}