summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockPortal.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-08-20 16:23:31 +0200
committerMattes D <github@xoft.cz>2014-08-20 16:23:31 +0200
commit5410a36f92c1c94f25552dff4a46b9611f0cb917 (patch)
tree920627577c09fd3270b08bab3e7a6d3d29d52025 /src/Blocks/BlockPortal.h
parentPlayer: Silenced a few type conversion warnings. (diff)
parentRemoved old classes from the CMakeLists.txt (diff)
downloadcuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.gz
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.bz2
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.lz
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.xz
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.zst
cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockPortal.h8
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
}