summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-12-20 00:06:26 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-12-20 00:06:26 +0100
commitc08910d4afd440e865f8726efacb98c3b5b60dfc (patch)
tree81086c67e7e8c776bc14dcec4bb9c663c2dab25d
parentMerge pull request #450 from mc-server/redstonefixes (diff)
downloadcuberite-c08910d4afd440e865f8726efacb98c3b5b60dfc.tar
cuberite-c08910d4afd440e865f8726efacb98c3b5b60dfc.tar.gz
cuberite-c08910d4afd440e865f8726efacb98c3b5b60dfc.tar.bz2
cuberite-c08910d4afd440e865f8726efacb98c3b5b60dfc.tar.lz
cuberite-c08910d4afd440e865f8726efacb98c3b5b60dfc.tar.xz
cuberite-c08910d4afd440e865f8726efacb98c3b5b60dfc.tar.zst
cuberite-c08910d4afd440e865f8726efacb98c3b5b60dfc.zip
Diffstat (limited to '')
-rw-r--r--VC2013/MCServer.vcxproj2
-rw-r--r--VC2013/MCServer.vcxproj.filters6
-rw-r--r--src/Blocks/BlockDirt.h2
3 files changed, 9 insertions, 1 deletions
diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj
index 334aa875c..50a938ad2 100644
--- a/VC2013/MCServer.vcxproj
+++ b/VC2013/MCServer.vcxproj
@@ -224,6 +224,7 @@
<ResourceCompile Include="MCServer.rc" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\src\Entities\Floater.h" />
<ClInclude Include="resource_MCServer.h" />
<ClInclude Include="..\src\Authenticator.h" />
<ClInclude Include="..\src\BlockArea.h" />
@@ -628,6 +629,7 @@
<ClCompile Include="..\src\Cuboid.cpp" />
<ClCompile Include="..\src\DeadlockDetect.cpp" />
<ClCompile Include="..\src\Enchantments.cpp" />
+ <ClCompile Include="..\src\Entities\Floater.cpp" />
<ClCompile Include="..\src\FastRandom.cpp" />
<ClCompile Include="..\src\FurnaceRecipe.cpp" />
<ClCompile Include="..\src\Globals.cpp">
diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters
index 724e1866d..74ddfafa8 100644
--- a/VC2013/MCServer.vcxproj.filters
+++ b/VC2013/MCServer.vcxproj.filters
@@ -945,6 +945,9 @@
<ClInclude Include="..\src\HTTPServer\NameValueParser.h">
<Filter>Source Files\HTTPServer</Filter>
</ClInclude>
+ <ClInclude Include="..\src\Entities\Floater.h">
+ <Filter>Source Files\Entities</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\webadmin\template.html">
@@ -1657,6 +1660,9 @@
<ClCompile Include="..\src\HTTPServer\NameValueParser.cpp">
<Filter>Source Files\HTTPServer</Filter>
</ClCompile>
+ <ClCompile Include="..\src\Entities\Floater.cpp">
+ <Filter>Source Files\Entities</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<Text Include="..\lib\sqlite\urls.txt">
diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h
index a83dab1fd..46210e406 100644
--- a/src/Blocks/BlockDirt.h
+++ b/src/Blocks/BlockDirt.h
@@ -80,7 +80,7 @@ public:
Chunk->GetBlockTypeMeta(BlockX, BlockY + 1, BlockZ, AboveDest, AboveMeta);
if ((g_BlockOneHitDig[AboveDest] || g_BlockTransparent[AboveDest]) && !IsBlockWater(AboveDest))
{
- Chunk->FastSetBlock(a_RelX + OfsX, a_RelY + OfsY, a_RelZ + OfsZ, E_BLOCK_GRASS, 0);
+ Chunk->FastSetBlock(BlockX, BlockY, BlockZ, E_BLOCK_GRASS, 0);
}
} // for i - repeat twice
}