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

Merge pull request #451 from mc-server/dirtupdatefix

Browse Source 
Fixed assertion during dirt block OnUpdate()
This commit is contained in:
Alexander Harkness 2013-12-19 23:05:27 -08:00
commit bf31e80280
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VC2013/MCServer.vcxproj
View File

@ -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">

6
VC2013/MCServer.vcxproj.filters
View File

@ -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">

2
src/Blocks/BlockDirt.h
View File

@ -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
}