flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Lilypads: add missing boundary check

Browse Source
This commit is contained in:
Tiger Wang 2020-11-28 20:48:53 +00:00
parent 7027b2279f
commit 815f2aed82
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Items/ItemLilypad.h
View File

@ -63,9 +63,15 @@ public:
return false; return false;
} }
// Lilypad should be placed only if there is a water block below const auto Below = PlacePos.addedY(-1);
if (Below.y < 0)
{
return false;
}
// Lilypad should be placed only if there is a water block below:
if ( if (
const auto BlockBelow = a_World->GetBlock(PlacePos.addedY(-1)); const auto BlockBelow = a_World->GetBlock(Below);
(BlockBelow != E_BLOCK_WATER) && (BlockBelow != E_BLOCK_WATER) &&
(BlockBelow != E_BLOCK_STATIONARY_WATER) (BlockBelow != E_BLOCK_STATIONARY_WATER)
) )
@ -78,6 +84,7 @@ public:
{ {
a_Player->GetInventory().RemoveOneEquippedItem(); a_Player->GetInventory().RemoveOneEquippedItem();
} }
return true; return true;
} }