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

fix std:min call, include algorithm and compare same type

This commit is contained in:
Steven Riehl 2014-10-11 21:36:40 -06:00
parent dfd4e15ecb
commit 4a25760363
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BlockEntities/BeaconEntity.cpp
View File

@ -5,7 +5,7 @@
#include "../BlockArea.h"
#include "../Entities/Player.h"
#include <algorithm>
@ -227,7 +227,7 @@ void cBeaconEntity::GiveEffects(void)
virtual bool Item(cPlayer * a_Player)
{
Vector3d PlayerPosition = Vector3d(a_Player->GetPosition());
PlayerPosition.y = std::min(m_PosY, static_cast<double>(PlayerPosition.y))
PlayerPosition.y = std::min(static_cast<double>(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);