diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-05-29 17:58:55 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-05-29 17:58:55 +0200 |
| commit | 60a37c1370dc766c55a344090d8d26bc2e1c1c99 (patch) | |
| tree | 953bf3edb21eed01e0e2da1e2375606e4c9db9eb /src | |
| parent | Cauldrons fill (diff) | |
| download | cuberite-60a37c1370dc766c55a344090d8d26bc2e1c1c99.tar cuberite-60a37c1370dc766c55a344090d8d26bc2e1c1c99.tar.gz cuberite-60a37c1370dc766c55a344090d8d26bc2e1c1c99.tar.bz2 cuberite-60a37c1370dc766c55a344090d8d26bc2e1c1c99.tar.lz cuberite-60a37c1370dc766c55a344090d8d26bc2e1c1c99.tar.xz cuberite-60a37c1370dc766c55a344090d8d26bc2e1c1c99.tar.zst cuberite-60a37c1370dc766c55a344090d8d26bc2e1c1c99.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Blocks/BlockBed.cpp | 2 | ||||
| -rw-r--r-- | src/Blocks/BlockPortal.h | 2 | ||||
| -rw-r--r-- | src/Mobs/Monster.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockBed.cpp b/src/Blocks/BlockBed.cpp index 6a3c6a55b..07ef997dd 100644 --- a/src/Blocks/BlockBed.cpp +++ b/src/Blocks/BlockBed.cpp @@ -108,7 +108,7 @@ void cBlockBedHandler::OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); if (Meta & 0x4) { - a_Player->SendMessageFailure("This bed is occupied."); + a_Player->SendMessageFailure("This bed is occupied"); } else { diff --git a/src/Blocks/BlockPortal.h b/src/Blocks/BlockPortal.h index 3b8030028..e718d9a70 100644 --- a/src/Blocks/BlockPortal.h +++ b/src/Blocks/BlockPortal.h @@ -55,7 +55,7 @@ public: 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)) // Y can't be < 0 or > Height; (Fast)SetBlock won't allow it { 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 } diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index a9ca7a2fa..839d21314 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -1024,7 +1024,7 @@ void cMonster::HandleDaylightBurning(cChunk & a_Chunk) (a_Chunk.GetBlock(RelX, RelY, RelZ) != E_BLOCK_SOULSAND) && // Not on soulsand (GetWorld()->GetTimeOfDay() < (12000 + 1000)) && // It is nighttime !IsOnFire() && // Not already burning - (GetWorld()->GetWeather() != eWeather_Rain) // Not raining + (GetWorld()->IsWeatherWet()) // Not raining ) { // Burn for 100 ticks, then decide again |