diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-12-10 22:24:02 +0100 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-12-10 22:24:02 +0100 |
commit | 9987611792c773b92bfa29508e20d39bcc53e0c3 (patch) | |
tree | d8593e82fc4acd6cdec295983e0076c6f4594e47 /src | |
parent | Merge pull request #414 from worktycho/abortondeadlock (diff) | |
download | cuberite-9987611792c773b92bfa29508e20d39bcc53e0c3.tar cuberite-9987611792c773b92bfa29508e20d39bcc53e0c3.tar.gz cuberite-9987611792c773b92bfa29508e20d39bcc53e0c3.tar.bz2 cuberite-9987611792c773b92bfa29508e20d39bcc53e0c3.tar.lz cuberite-9987611792c773b92bfa29508e20d39bcc53e0c3.tar.xz cuberite-9987611792c773b92bfa29508e20d39bcc53e0c3.tar.zst cuberite-9987611792c773b92bfa29508e20d39bcc53e0c3.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/Blocks/BlockHandler.cpp | 2 | ||||
-rw-r--r-- | src/Simulator/RedstoneSimulator.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp index fde6bd803..d377823f7 100644 --- a/src/Blocks/BlockHandler.cpp +++ b/src/Blocks/BlockHandler.cpp @@ -375,7 +375,7 @@ void cBlockHandler::DropBlock(cWorld * a_World, cEntity * a_Digger, int a_BlockX MicroY = a_BlockY + 0.5; MicroZ = a_BlockZ + 0.5; - // Add random offset second (this causes pickups to spawn inside blocks most times, it's a little buggy) + // Add random offset second MicroX += r1.rand(1) - 0.5; MicroZ += r1.rand(1) - 0.5; diff --git a/src/Simulator/RedstoneSimulator.cpp b/src/Simulator/RedstoneSimulator.cpp index 9328b9fcb..daf3aaead 100644 --- a/src/Simulator/RedstoneSimulator.cpp +++ b/src/Simulator/RedstoneSimulator.cpp @@ -630,7 +630,7 @@ void cRedstoneSimulator::HandleRedstoneRepeater(int a_BlockX, int a_BlockY, int // Self not in list, add self to list sRepeatersDelayList RC; RC.a_BlockPos = Vector3i(a_BlockX, a_BlockY, a_BlockZ); - RC.a_DelayTicks = ((a_Meta & 0xC) >> 0x2) + 1; + RC.a_DelayTicks = ((a_Meta & 0xC) >> 0x2); // Repeaters power off slower than they power on, so no +1. Why? No idea. RC.a_ElapsedTicks = 0; m_RepeatersDelayList.push_back(RC); return; |