summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-14 19:05:00 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-14 19:05:00 +0200
commitdd554175a42060bcab425231bef5c33977025c68 (patch)
treee50375d829c9fb0d1f51e585e7b0de151f7a3083
parentFixed the bucket handling code trying to simulate at the wrong coords (client sends all coords as -1 to signify "item use") (diff)
downloadcuberite-dd554175a42060bcab425231bef5c33977025c68.tar
cuberite-dd554175a42060bcab425231bef5c33977025c68.tar.gz
cuberite-dd554175a42060bcab425231bef5c33977025c68.tar.bz2
cuberite-dd554175a42060bcab425231bef5c33977025c68.tar.lz
cuberite-dd554175a42060bcab425231bef5c33977025c68.tar.xz
cuberite-dd554175a42060bcab425231bef5c33977025c68.tar.zst
cuberite-dd554175a42060bcab425231bef5c33977025c68.zip
Diffstat (limited to '')
-rw-r--r--MCServer/items.ini2
-rw-r--r--source/Generating/ChunkGenerator.cpp2
-rw-r--r--source/Generating/CompoGen.cpp4
3 files changed, 5 insertions, 3 deletions
diff --git a/MCServer/items.ini b/MCServer/items.ini
index a1dcf2a28..3d51ae602 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -33,9 +33,11 @@ bedrock=7
water=8
stillwater=9
swater=9
+stationarywater=9
lava=10
stilllava=11
slava=11
+stationarylava=11
sand=12
gravel=13
goldore=14
diff --git a/source/Generating/ChunkGenerator.cpp b/source/Generating/ChunkGenerator.cpp
index eca24c6a7..b4bd1410d 100644
--- a/source/Generating/ChunkGenerator.cpp
+++ b/source/Generating/ChunkGenerator.cpp
@@ -271,7 +271,7 @@ void cChunkGenerator::InitCompositionGen(cIniFile & a_IniFile)
BLOCKTYPE BlockBottom = GetIniBlock(a_IniFile, "Generator", "ClassicBlockBottom", "stone");
BLOCKTYPE BlockBeach = GetIniBlock(a_IniFile, "Generator", "ClassicBlockBeach", "sand");
BLOCKTYPE BlockBeachBottom = GetIniBlock(a_IniFile, "Generator", "ClassicBlockBeachBottom", "sandstone");
- BLOCKTYPE BlockSea = GetIniBlock(a_IniFile, "Generator", "ClassicBlockSea", "9");
+ BLOCKTYPE BlockSea = GetIniBlock(a_IniFile, "Generator", "ClassicBlockSea", "stationarywater");
m_CompositionGen = new cCompoGenClassic(
SeaLevel, BeachHeight, BeachDepth, BlockTop, BlockMiddle, BlockBottom, BlockBeach,
BlockBeachBottom, BlockSea
diff --git a/source/Generating/CompoGen.cpp b/source/Generating/CompoGen.cpp
index 046310d91..9983a6d57 100644
--- a/source/Generating/CompoGen.cpp
+++ b/source/Generating/CompoGen.cpp
@@ -372,7 +372,7 @@ void cCompoGenBiomal::FillColumnWaterSand(int a_RelX, int a_RelZ, int a_Height,
FillColumnSand(a_RelX, a_RelZ, a_Height, a_BlockTypes);
for (int y = a_Height + 1; y <= m_SeaLevel + 1; y++)
{
- cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, E_BLOCK_WATER);
+ cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, E_BLOCK_STATIONARY_WATER);
}
}
@@ -404,7 +404,7 @@ void cCompoGenBiomal::FillColumnWaterMix(int a_ChunkX, int a_ChunkZ, int a_RelX,
}
for (int y = a_Height + 1; y <= m_SeaLevel + 1; y++)
{
- cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, E_BLOCK_WATER);
+ cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, E_BLOCK_STATIONARY_WATER);
}
}
}