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

Added checks for ice into IsBlockWater()

Browse Source 
* This fixes players spawning in vast oceans of ice, as opposed to the
previous water
This commit is contained in:
Tiger Wang
2014-02-01 21:40:50 +00:00
parent b0784d1931
commit e26dc5cc0a
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Defines.h
View File

@@ -254,9 +254,16 @@ inline bool IsValidItem(int a_ItemType)
inline bool IsBlockWater(BLOCKTYPE a_BlockType)
inline bool IsBlockWater(BLOCKTYPE a_BlockType, bool a_IncludeFrozenWater = false)
{
return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER));
if (a_IncludeFrozenWater)
{
return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER) || (a_BlockType == E_BLOCK_ICE));
}
else
{
return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER));
}
}