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

Merge pull request #2727 from Gargaj/patch-4

Browse Source 
Test for correct coordinates when fishing
This commit is contained in:
Alexander Harkness 2015-12-10 21:04:45 +00:00
commit 4b10146b2e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/Floater.cpp
View File

@ -155,7 +155,7 @@ void cFloater::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
} }
m_CountDownTime--; m_CountDownTime--;
if (m_World->GetHeight(POSX_TOINT, POSY_TOINT) == POSZ_TOINT) if (m_World->GetHeight(POSX_TOINT, POSZ_TOINT) == POSY_TOINT)
{ {
if (m_World->IsWeatherWet() && m_World->GetTickRandomNumber(3) == 0) // 25% chance of an extra countdown when being rained on. if (m_World->IsWeatherWet() && m_World->GetTickRandomNumber(3) == 0) // 25% chance of an extra countdown when being rained on.
{ {

1
src/WorldStorage/NBTChunkSerializer.cpp
View File

@ -922,6 +922,7 @@ void cNBTChunkSerializer::Entity(cEntity * a_Entity)
case cEntity::etItemFrame: AddItemFrameEntity (reinterpret_cast<cItemFrame *> (a_Entity)); break; case cEntity::etItemFrame: AddItemFrameEntity (reinterpret_cast<cItemFrame *> (a_Entity)); break;
case cEntity::etPainting: AddPaintingEntity (reinterpret_cast<cPainting *> (a_Entity)); break; case cEntity::etPainting: AddPaintingEntity (reinterpret_cast<cPainting *> (a_Entity)); break;
case cEntity::etPlayer: return; // Players aren't saved into the world case cEntity::etPlayer: return; // Players aren't saved into the world
case cEntity::etFloater: return; // Floaters aren't saved either
default: default:
{ {
ASSERT(!"Unhandled entity type is being saved"); ASSERT(!"Unhandled entity type is being saved");