diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-03 22:25:42 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-03 22:25:42 +0100 |
| commit | a3759c1462fd2fe89a545fc9ece90559b4a2469a (patch) | |
| tree | dc46c925aec3e28fdb610f55245377453e67fa73 /src/World.cpp | |
| parent | Fixed #626 (diff) | |
| parent | Merge pull request #623 from mc-server/tnt (diff) | |
| download | cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar.gz cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar.bz2 cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar.lz cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar.xz cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar.zst cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/World.cpp b/src/World.cpp index 78b42e810..de2002b84 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -632,7 +632,7 @@ void cWorld::GenerateRandomSpawn(void) { LOGD("Generating random spawnpoint..."); - while (IsBlockWater(GetBlock((int)m_SpawnX, GetHeight((int)m_SpawnX, (int)m_SpawnZ), (int)m_SpawnZ))) + while (IsBlockWaterOrIce(GetBlock((int)m_SpawnX, GetHeight((int)m_SpawnX, (int)m_SpawnZ), (int)m_SpawnZ))) { if ((GetTickRandomNumber(4) % 2) == 0) // Randomise whether to increment X or Z coords { @@ -1551,7 +1551,7 @@ void cWorld::SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_FlyAwaySpeed /= 100; // Pre-divide, so that we don't have to divide each time inside the loop for (cItems::const_iterator itr = a_Pickups.begin(); itr != a_Pickups.end(); ++itr) { - if (!IsValidItem(itr->m_ItemType)) + if (!IsValidItem(itr->m_ItemType) || itr->m_ItemType == E_BLOCK_AIR) { // Don't spawn pickup if item isn't even valid; should prevent client crashing too continue; @@ -1577,7 +1577,7 @@ void cWorld::SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double { for (cItems::const_iterator itr = a_Pickups.begin(); itr != a_Pickups.end(); ++itr) { - if (!IsValidItem(itr->m_ItemType)) + if (!IsValidItem(itr->m_ItemType) || itr->m_ItemType == E_BLOCK_AIR) { continue; } |