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

More suggestions

Browse Source
This commit is contained in:
Tiger Wang 2014-06-21 20:42:10 +01:00
parent b2fbcaf1bf
commit 1296c5dce7
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/Entity.cpp
View File

@ -869,7 +869,7 @@ void cEntity::TickBurning(cChunk & a_Chunk)
// Remember the current burning state: // Remember the current burning state:
bool HasBeenBurning = (m_TicksLeftBurning > 0); bool HasBeenBurning = (m_TicksLeftBurning > 0);
if (IsBiomeNoDownfall(a_Chunk.GetBiomeAt(POSX_TOINT - a_Chunk.GetPosX() * cChunkDef::Width, POSZ_TOINT - a_Chunk.GetPosZ() * cChunkDef::Width)) || GetWorld()->IsWeatherWet()) if (GetWorld()->IsWeatherWetAt(POSX_TOINT, POSZ_TOINT))
{ {
if (POSY_TOINT > m_World->GetHeight(POSX_TOINT, POSZ_TOINT)) if (POSY_TOINT > m_World->GetHeight(POSX_TOINT, POSZ_TOINT))
{ {

2
src/Entities/Player.cpp
View File

@ -1599,7 +1599,7 @@ bool cPlayer::MoveToWorld(const AString & a_WorldName, cWorld * a_World, bool a_
m_ClientHandle->SendRespawn(World->GetDimension()); m_ClientHandle->SendRespawn(World->GetDimension());
} }
// Remove player from old world // Remove player from the old world
m_World->RemovePlayer(this); m_World->RemovePlayer(this);
// Queue adding player to the new world, including all the necessary adjustments to the object // Queue adding player to the new world, including all the necessary adjustments to the object

6
src/Entities/Player.h
View File

@ -350,7 +350,7 @@ public:
void SendExperience(void); void SendExperience(void);
/** In UI windows, the item that the player is dragging */ /** In UI windows, get the item that the player is dragging */
cItem & GetDraggingItem(void) {return m_DraggingItem; } cItem & GetDraggingItem(void) {return m_DraggingItem; }
// In UI windows, when inventory-painting: // In UI windows, when inventory-painting:
@ -398,7 +398,9 @@ public:
/** If true the player can fly even when he's not in creative. */ /** If true the player can fly even when he's not in creative. */
void SetCanFly(bool a_CanFly); void SetCanFly(bool a_CanFly);
/** Gets the last position that the player slept in */ /** Gets the last position that the player slept in
This is initialised to the world spawn point if the player has not slept in a bed as of yet
*/
Vector3i GetLastBedPos(void) const { return m_LastBedPos; } Vector3i GetLastBedPos(void) const { return m_LastBedPos; }
/** Sets the player's bed (home) position */ /** Sets the player's bed (home) position */

2
src/Mobs/Monster.cpp
View File

@ -1034,7 +1034,7 @@ void cMonster::HandleDaylightBurning(cChunk & a_Chunk)
(a_Chunk.GetBlock(RelX, RelY, RelZ) != E_BLOCK_SOULSAND) && // Not on soulsand (a_Chunk.GetBlock(RelX, RelY, RelZ) != E_BLOCK_SOULSAND) && // Not on soulsand
(GetWorld()->GetTimeOfDay() < (12000 + 1000)) && // It is nighttime (GetWorld()->GetTimeOfDay() < (12000 + 1000)) && // It is nighttime
!IsOnFire() && // Not already burning !IsOnFire() && // Not already burning
(IsBiomeNoDownfall(a_Chunk.GetBiomeAt(RelX, RelZ)) || !GetWorld()->IsWeatherWet()) // Not raining GetWorld()->IsWeatherWetAt(POSX_TOINT, POSZ_TOINT) // Not raining
) )
{ {
// Burn for 100 ticks, then decide again // Burn for 100 ticks, then decide again