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

Test for correct coordinates when fishing

Browse Source 
Fun fact: this was able to actually deadlock the server depending on where you were standing :)
This commit is contained in:
Gargaj 2015-12-10 20:41:51 +01:00 committed by Benjamin Mintz
parent 65c89f052b
commit 56e7329f29
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--;
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.
{

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::etPainting: AddPaintingEntity (reinterpret_cast<cPainting *> (a_Entity)); break;
case cEntity::etPlayer: return; // Players aren't saved into the world
case cEntity::etFloater: return; // Floaters aren't saved either
default:
{
ASSERT(!"Unhandled entity type is being saved");