diff options
| author | Mattes D <github@xoft.cz> | 2014-01-25 22:36:32 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-01-25 22:36:32 +0100 |
| commit | cdcad2237a91dfd18cde539c300034f84bc8c07b (patch) | |
| tree | 5f3266637858980f29ff3ee4cc4c116e575797d3 /src/World.cpp | |
| parent | Merge pull request #583 from mc-server/ChangeToPolarSSL (diff) | |
| parent | Did what xoft recommended (diff) | |
| download | cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar.gz cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar.bz2 cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar.lz cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar.xz cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar.zst cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/World.cpp b/src/World.cpp index 453a22c2d..5205c2616 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -234,7 +234,11 @@ cWorld::cWorld(const AString & a_WorldName) : m_WorldName(a_WorldName), m_IniFileName(m_WorldName + "/world.ini"), m_StorageSchema("Default"), +#ifdef _arm_ + m_StorageCompressionFactor(0), +#else m_StorageCompressionFactor(6), +#endif m_IsSpawnExplicitlySet(false), m_WorldAgeSecs(0), m_TimeOfDaySecs(0), @@ -2419,7 +2423,7 @@ bool cWorld::FindAndDoWithPlayer(const AString & a_PlayerNameHint, cPlayerListCa // TODO: This interface is dangerous! -cPlayer * cWorld::FindClosestPlayer(const Vector3f & a_Pos, float a_SightLimit) +cPlayer * cWorld::FindClosestPlayer(const Vector3f & a_Pos, float a_SightLimit, bool a_CheckLineOfSight) { cTracer LineOfSight(this); @@ -2434,7 +2438,12 @@ cPlayer * cWorld::FindClosestPlayer(const Vector3f & a_Pos, float a_SightLimit) if (Distance < ClosestDistance) { - if (!LineOfSight.Trace(a_Pos,(Pos - a_Pos),(int)(Pos - a_Pos).Length())) + if (a_CheckLineOfSight && !LineOfSight.Trace(a_Pos,(Pos - a_Pos),(int)(Pos - a_Pos).Length())) + { + ClosestDistance = Distance; + ClosestPlayer = *itr; + } + else { ClosestDistance = Distance; ClosestPlayer = *itr; |