diff options
| author | Alexander Harkness <bearbin@gmail.com> | 2013-12-20 08:05:27 +0100 |
|---|---|---|
| committer | Alexander Harkness <bearbin@gmail.com> | 2013-12-20 08:05:27 +0100 |
| commit | bf31e8028092a8e7419890f0611a9f03b044df92 (patch) | |
| tree | 81086c67e7e8c776bc14dcec4bb9c663c2dab25d | |
| parent | Merge pull request #450 from mc-server/redstonefixes (diff) | |
| parent | Fixed assertion during dirt block OnUpdate() (diff) | |
| download | cuberite-bf31e8028092a8e7419890f0611a9f03b044df92.tar cuberite-bf31e8028092a8e7419890f0611a9f03b044df92.tar.gz cuberite-bf31e8028092a8e7419890f0611a9f03b044df92.tar.bz2 cuberite-bf31e8028092a8e7419890f0611a9f03b044df92.tar.lz cuberite-bf31e8028092a8e7419890f0611a9f03b044df92.tar.xz cuberite-bf31e8028092a8e7419890f0611a9f03b044df92.tar.zst cuberite-bf31e8028092a8e7419890f0611a9f03b044df92.zip | |
| -rw-r--r-- | VC2013/MCServer.vcxproj | 2 | ||||
| -rw-r--r-- | VC2013/MCServer.vcxproj.filters | 6 | ||||
| -rw-r--r-- | src/Blocks/BlockDirt.h | 2 |
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 } |