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

refactor an if block to std::min

Browse Source
This commit is contained in:
Steven Riehl 2014-10-11 21:18:57 -06:00
parent 856764dee8
commit dfd4e15ecb
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BlockEntities/BeaconEntity.cpp
View File

@ -227,10 +227,7 @@ void cBeaconEntity::GiveEffects(void)
virtual bool Item(cPlayer * a_Player)
{
Vector3d PlayerPosition = Vector3d(a_Player->GetPosition());
if (PlayerPosition.y > static_cast<double>(m_PosY))
{
PlayerPosition.y = static_cast<double>(m_PosY);
}
PlayerPosition.y = std::min(m_PosY, static_cast<double>(PlayerPosition.y))
// TODO: Vanilla minecraft uses an AABB check instead of a radius one
Vector3d BeaconPosition = Vector3d(m_PosX, m_PosY, m_PosZ);