diff options
| author | Steven Riehl <sriehl@gmail.com> | 2014-10-12 04:39:55 +0200 |
|---|---|---|
| committer | Steven Riehl <sriehl@gmail.com> | 2014-10-12 04:39:55 +0200 |
| commit | 856764dee8f0c66397669e8c7c013c758f1d2c81 (patch) | |
| tree | 4d8e3f0a63410b99728929ef1ce220c5392d5bf5 /src/BlockEntities/BeaconEntity.cpp | |
| parent | Update README.md (diff) | |
| download | cuberite-856764dee8f0c66397669e8c7c013c758f1d2c81.tar cuberite-856764dee8f0c66397669e8c7c013c758f1d2c81.tar.gz cuberite-856764dee8f0c66397669e8c7c013c758f1d2c81.tar.bz2 cuberite-856764dee8f0c66397669e8c7c013c758f1d2c81.tar.lz cuberite-856764dee8f0c66397669e8c7c013c758f1d2c81.tar.xz cuberite-856764dee8f0c66397669e8c7c013c758f1d2c81.tar.zst cuberite-856764dee8f0c66397669e8c7c013c758f1d2c81.zip | |
Diffstat (limited to 'src/BlockEntities/BeaconEntity.cpp')
| -rw-r--r-- | src/BlockEntities/BeaconEntity.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp index 02f45a097..de23f7e79 100644 --- a/src/BlockEntities/BeaconEntity.cpp +++ b/src/BlockEntities/BeaconEntity.cpp @@ -227,9 +227,9 @@ void cBeaconEntity::GiveEffects(void) virtual bool Item(cPlayer * a_Player) { Vector3d PlayerPosition = Vector3d(a_Player->GetPosition()); - if (PlayerPosition.y > (double)m_PosY) + if (PlayerPosition.y > static_cast<double>(m_PosY)) { - PlayerPosition.y = (double)m_PosY; + PlayerPosition.y = static_cast<double>(m_PosY); } // TODO: Vanilla minecraft uses an AABB check instead of a radius one @@ -255,7 +255,7 @@ void cBeaconEntity::GiveEffects(void) , m_PrimaryEffect(a_PrimaryEffect) , m_SecondaryEffect(a_SecondaryEffect) , m_EffectLevel(a_EffectLevel) - {}; + {} } PlayerCallback(Radius, m_PosX, m_PosY, m_PosZ, m_PrimaryEffect, SecondaryEffect, EffectLevel); GetWorld()->ForEachPlayer(PlayerCallback); @@ -288,7 +288,7 @@ void cBeaconEntity::UsedBy(cPlayer * a_Player) OpenWindow(new cBeaconWindow(m_PosX, m_PosY, m_PosZ, this)); Window = GetWindow(); } - + if (Window != NULL) { // if (a_Player->GetWindow() != Window) @@ -307,7 +307,3 @@ void cBeaconEntity::SendTo(cClientHandle & a_Client) { a_Client.SendUpdateBlockEntity(*this); } - - - - |