diff options
| author | Mattes D <github@xoft.cz> | 2015-03-11 14:26:04 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-03-11 14:26:04 +0100 |
| commit | 1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0 (patch) | |
| tree | 961b0a521e31ba4f0a1b3516b49173c723ae24bd /src/BlockEntities/BeaconEntity.cpp | |
| parent | Merge pull request #1805 from mc-server/chunkDataFix (diff) | |
| parent | Moved window code into cpp files (diff) | |
| download | cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar.gz cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar.bz2 cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar.lz cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar.xz cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar.zst cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.zip | |
Diffstat (limited to 'src/BlockEntities/BeaconEntity.cpp')
| -rw-r--r-- | src/BlockEntities/BeaconEntity.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp index 37ce7a8ab..fb3940ce9 100644 --- a/src/BlockEntities/BeaconEntity.cpp +++ b/src/BlockEntities/BeaconEntity.cpp @@ -4,6 +4,7 @@ #include "BeaconEntity.h" #include "../BlockArea.h" #include "../Entities/Player.h" +#include "../UI/BeaconWindow.h" @@ -289,7 +290,7 @@ void cBeaconEntity::UsedBy(cPlayer * a_Player) OpenWindow(new cBeaconWindow(m_PosX, m_PosY, m_PosZ, this)); Window = GetWindow(); } - + if (Window != nullptr) { // if (a_Player->GetWindow() != Window) |