summaryrefslogtreecommitdiffstats
path: root/src/Simulator
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-24 10:19:13 +0200
committerMattes D <github@xoft.cz>2014-10-24 10:19:13 +0200
commit765bf006ad28d6dfcddd6c29ec203bbc7753e332 (patch)
tree2ddd79061104d4a4f80442a432a52fd81120e631 /src/Simulator
parentSuggestions (diff)
parentMerge pull request #1565 from mc-server/MergedIniFile (diff)
downloadcuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.gz
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.bz2
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.lz
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.xz
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.zst
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.zip
Diffstat (limited to 'src/Simulator')
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator.inc1
-rw-r--r--src/Simulator/SandSimulator.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator.inc b/src/Simulator/IncrementalRedstoneSimulator.inc
index 200fc0971..2d03584e2 100644
--- a/src/Simulator/IncrementalRedstoneSimulator.inc
+++ b/src/Simulator/IncrementalRedstoneSimulator.inc
@@ -2001,7 +2001,6 @@ bool cIncrementalRedstoneSimulator<ChunkType, WorldType, GetHandlerCompileTime,
// Check if western(left) neighbor is a powered on repeater who is facing us
if (m_Chunk->UnboundedRelGetBlock(a_RelBlockX - 1, a_RelBlockY, a_RelBlockZ, Block, OtherRepeaterDir) && (Block == E_BLOCK_REDSTONE_REPEATER_ON))
{
- NIBBLETYPE OtherRepeaterDir = m_Chunk->GetMeta(a_RelBlockX -1, a_RelBlockY, a_RelBlockZ) & 0x3;
if ((OtherRepeaterDir & 0x03) == 0x1)
{
return true;
diff --git a/src/Simulator/SandSimulator.cpp b/src/Simulator/SandSimulator.cpp
index 073518b31..dfbd3e458 100644
--- a/src/Simulator/SandSimulator.cpp
+++ b/src/Simulator/SandSimulator.cpp
@@ -7,7 +7,7 @@
#include "../Defines.h"
#include "../Entities/FallingBlock.h"
#include "../Chunk.h"
-#include "inifile/iniFile.h"
+#include "../IniFile.h"