From 85c298d73e871daadf91671cdae9db83e30f9029 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 25 Oct 2014 21:54:00 +0100 Subject: Cleaned up simulators --- src/World.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/World.cpp') diff --git a/src/World.cpp b/src/World.cpp index 2e079d447..8f326cea4 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -3352,7 +3352,7 @@ void cWorld::SetChunkAlwaysTicked(int a_ChunkX, int a_ChunkZ, bool a_AlwaysTicke -cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) +cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) { AString SimulatorName = a_IniFile.GetValueSet("Physics", "RedstoneSimulator", "Incremental"); @@ -3362,11 +3362,11 @@ cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFil SimulatorName = "Incremental"; } - cRedstoneSimulator * res = nullptr; + cRedstoneSimulator * res = nullptr; if (NoCaseCompare(SimulatorName, "Incremental") == 0) { - res = MakeIncrementalRedstoneSimulator(*this); + res = new cIncrementalRedstoneSimulator(*this); } else if (NoCaseCompare(SimulatorName, "noop") == 0) { -- cgit v1.2.3 From 2a8c234f464ebf9986132c8ba435f1a1cec3461c Mon Sep 17 00:00:00 2001 From: Howaner Date: Sat, 13 Dec 2014 20:31:37 +0100 Subject: Fixes --- src/World.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/World.cpp') diff --git a/src/World.cpp b/src/World.cpp index 1bee6e344..fc4a1fdfd 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -1520,7 +1520,21 @@ bool cWorld::GrowRipePlant(int a_BlockX, int a_BlockY, int a_BlockZ, bool a_IsBy } return true; } - + + case E_BLOCK_COCOA_POD: + { + NIBBLETYPE TypeMeta = BlockMeta & 0x03; + int GrowState = (BlockMeta & 0x0f) >> 2; + + if (GrowState < 2) + { + GrowState++; + FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, BlockType, (NIBBLETYPE) (GrowState << 2 | TypeMeta)); + BroadcastSoundParticleEffect(2005, a_BlockX, a_BlockY, a_BlockZ, 0); + } + return true; + } + case E_BLOCK_CROPS: { if (a_IsByBonemeal && !m_IsCropsBonemealable) -- cgit v1.2.3 From bed456033f9856ad110368a4eb9c8317c4378acb Mon Sep 17 00:00:00 2001 From: Howaner Date: Sun, 14 Dec 2014 13:14:48 +0100 Subject: "& 0x0f" isn't needed --- src/World.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/World.cpp') diff --git a/src/World.cpp b/src/World.cpp index fc4a1fdfd..d3bde3559 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -1524,7 +1524,7 @@ bool cWorld::GrowRipePlant(int a_BlockX, int a_BlockY, int a_BlockZ, bool a_IsBy case E_BLOCK_COCOA_POD: { NIBBLETYPE TypeMeta = BlockMeta & 0x03; - int GrowState = (BlockMeta & 0x0f) >> 2; + int GrowState = BlockMeta >> 2; if (GrowState < 2) { -- cgit v1.2.3 From b3e5872c220af21a81c22f42fec94ae95d6503b4 Mon Sep 17 00:00:00 2001 From: Howaner Date: Sun, 14 Dec 2014 17:48:30 +0100 Subject: Fixed mob invisibility --- src/World.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/World.cpp') diff --git a/src/World.cpp b/src/World.cpp index d3bde3559..8050e6607 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -3294,7 +3294,6 @@ int cWorld::SpawnMobFinalize(cMonster * a_Monster) return -1; } - BroadcastSpawnEntity(*a_Monster); cPluginManager::Get()->CallHookSpawnedMonster(*this, *a_Monster); return a_Monster->GetUniqueID(); -- cgit v1.2.3