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

Merge pull request #602 from mc-server/improvementsandfixes

Browse Source 
Redstone crash fix and current console line replace function
This commit is contained in:
Mattes D
2014-02-02 22:02:25 -08:00
parent c1c7936c68 0f67f80c6e
commit b090547c17
7 changed files with 61 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Entities/Player.cpp
View File

@@ -786,11 +786,11 @@ void cPlayer::SetFlying(bool a_IsFlying)
void cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
{
if (a_TDI.DamageType != dtInVoid)
if ((a_TDI.DamageType != dtInVoid) && (a_TDI.DamageType != dtPlugin))
{
if (IsGameModeCreative())
{
// No damage / health in creative mode if not void damage
// No damage / health in creative mode if not void or plugin damage
return;
}
}