flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into awesometnt

Browse Source 
Conflicts:
	src/ChunkMap.cpp
This commit is contained in:
Tiger Wang
2014-03-18 20:49:08 +00:00
parent 23ffaa19b7 91f64da2a6
commit b8fe024f9d
135 changed files with 3250 additions and 1122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Simulator/IncrementalRedstoneSimulator.cpp
View File

@@ -1062,7 +1062,7 @@ void cIncrementalRedstoneSimulator::HandlePressurePlate(int a_BlockX, int a_Bloc
{
Vector3f EntityPos = a_Entity->GetPosition();
Vector3f BlockPos(m_X + 0.5f, (float)m_Y, m_Z + 0.5f);
float Distance = (EntityPos - BlockPos).Length();
double Distance = (EntityPos - BlockPos).Length();
if (Distance <= 0.7)
{