diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-22 11:24:28 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-22 11:24:28 +0200 |
| commit | 3385ed56b86a7816892e199fdda177ebb3a33966 (patch) | |
| tree | e4ebda8e1fc245e9a84c3c4b363c05bbbad3a85f /src/World.cpp | |
| parent | Suggestions (diff) | |
| parent | Updated prefabs to current Gallery content. (diff) | |
| download | cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar.gz cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar.bz2 cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar.lz cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar.xz cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar.zst cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/World.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/World.cpp b/src/World.cpp index 2af8fc59e..9dc28afea 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -579,11 +579,6 @@ void cWorld::Start(void) int Weather = IniFile.GetValueSetI("General", "Weather", (int)m_Weather); m_TimeOfDay = IniFile.GetValueSetI("General", "TimeInTicks", m_TimeOfDay); - if (GetDimension() == dimOverworld) - { - m_NetherWorldName = IniFile.GetValueSet("LinkedWorlds", "NetherWorldName", DEFAULT_NETHER_NAME); - m_EndWorldName = IniFile.GetValueSet("LinkedWorlds", "EndWorldName", DEFAULT_END_NAME); - } else { m_OverworldName = IniFile.GetValueSet("LinkedWorlds", "OverworldName", GetLinkedOverworldName()); @@ -619,7 +614,7 @@ void cWorld::Start(void) m_SimulatorManager->RegisterSimulator(m_FireSimulator, 1); m_Lighting.Start(this); - m_Storage.Start(this, m_StorageSchema, m_StorageCompressionFactor ); + m_Storage.Start(this, m_StorageSchema, m_StorageCompressionFactor); m_Generator.Start(m_GeneratorCallbacks, m_GeneratorCallbacks, IniFile); m_ChunkSender.Start(this); m_TickThread.Start(); @@ -962,14 +957,14 @@ void cWorld::TickMobs(float a_Dt) // move close mobs cMobProximityCounter::sIterablePair allCloseEnoughToMoveMobs = MobCensus.GetProximityCounter().getMobWithinThosesDistances(-1, 64 * 16);// MG TODO : deal with this magic number (the 16 is the size of a block) - for(cMobProximityCounter::tDistanceToMonster::const_iterator itr = allCloseEnoughToMoveMobs.m_Begin; itr != allCloseEnoughToMoveMobs.m_End; ++itr) + for (cMobProximityCounter::tDistanceToMonster::const_iterator itr = allCloseEnoughToMoveMobs.m_Begin; itr != allCloseEnoughToMoveMobs.m_End; ++itr) { itr->second.m_Monster.Tick(a_Dt, itr->second.m_Chunk); } // remove too far mobs cMobProximityCounter::sIterablePair allTooFarMobs = MobCensus.GetProximityCounter().getMobWithinThosesDistances(128 * 16, -1);// MG TODO : deal with this magic number (the 16 is the size of a block) - for(cMobProximityCounter::tDistanceToMonster::const_iterator itr = allTooFarMobs.m_Begin; itr != allTooFarMobs.m_End; ++itr) + for (cMobProximityCounter::tDistanceToMonster::const_iterator itr = allTooFarMobs.m_Begin; itr != allTooFarMobs.m_End; ++itr) { itr->second.m_Monster.Destroy(true); } @@ -2568,7 +2563,7 @@ cPlayer * cWorld::FindClosestPlayer(const Vector3d & a_Pos, float a_SightLimit, { if (a_CheckLineOfSight) { - if(!LineOfSight.Trace(a_Pos,(Pos - a_Pos),(int)(Pos - a_Pos).Length())) + if (!LineOfSight.Trace(a_Pos, (Pos - a_Pos), (int)(Pos - a_Pos).Length())) { ClosestDistance = Distance; ClosestPlayer = *itr; |