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

Merge branch 'master' into playerimprovements

Browse Source 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
This commit is contained in:
Tiger Wang
2014-02-09 00:04:42 +00:00
parent 14b5054c95 82173db9bf
commit f86f066615
96 changed files with 354 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChunkMap.cpp
View File

@@ -1808,7 +1808,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
if (FinalDamage > a_Entity->GetMaxHealth())
FinalDamage = a_Entity->GetMaxHealth();
else if (FinalDamage < 0)
return false;
FinalDamage = 0;
if (!a_Entity->IsTNT()) // Don't apply damage to other TNT entities, they should be invincible
{