diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-08-19 22:14:37 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-08-19 22:14:37 +0200 |
| commit | b5ffe06f884221f98407910bdd30baf533d84970 (patch) | |
| tree | 6f7768641979fa5f57525eb98e8a7e37b71bfe06 /src/Blocks/BlockPortal.h | |
| parent | Player: Silenced a few type conversion warnings. (diff) | |
| download | cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.gz cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.bz2 cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.lz cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.xz cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.zst cuberite-b5ffe06f884221f98407910bdd30baf533d84970.zip | |
Diffstat (limited to 'src/Blocks/BlockPortal.h')
| -rw-r--r-- | src/Blocks/BlockPortal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Blocks/BlockPortal.h b/src/Blocks/BlockPortal.h index fc74e89d0..8fac2a126 100644 --- a/src/Blocks/BlockPortal.h +++ b/src/Blocks/BlockPortal.h @@ -36,7 +36,7 @@ public: virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { - return; // No pickups + // No pickups } virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override @@ -47,15 +47,15 @@ public: return; } - int PosX = a_Chunk.GetPosX() * 16 + a_RelX; - int PosZ = a_Chunk.GetPosZ() * 16 + a_RelZ; + int PosX = a_Chunk.GetPosX() * cChunkDef::Width + a_RelX; + int PosZ = a_Chunk.GetPosZ() * cChunkDef::Width + a_RelZ; a_WorldInterface.SpawnMob(PosX, a_RelY, PosZ, cMonster::mtZombiePigman); } virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override { - if ((a_RelY - 1 < 0) || (a_RelY + 1 > cChunkDef::Height)) + if ((a_RelY <= 0) || (a_RelY >= cChunkDef::Height)) { return false; // In case someone places a portal with meta 1 or 2 at boundaries, and server tries to get invalid coords at Y - 1 or Y + 1 } |