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

Merge pull request #1135 from mc-server/fixes

Browse Source 
Fixes to projectiles and the undead
This commit is contained in:
Tiger Wang
2014-07-09 09:50:38 +01:00
parent f2419afac5 7c7501abc5
commit 372dbbb994
19 changed files with 271 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/WorldStorage/WSSAnvil.cpp
View File

@@ -1642,6 +1642,15 @@ void cWSSAnvil::LoadArrowFromNBT(cEntityList & a_Entities, const cParsedNBT & a_
Arrow->SetDamageCoeff(a_NBT.GetDouble(DamageIdx));
}
// Load block hit:
int InBlockXIdx = a_NBT.FindChildByName(a_TagIdx, "xTile");
int InBlockYIdx = a_NBT.FindChildByName(a_TagIdx, "yTile");
int InBlockZIdx = a_NBT.FindChildByName(a_TagIdx, "zTile");
if ((InBlockXIdx > 0) && (InBlockYIdx > 0) && (InBlockZIdx > 0))
{
Arrow->SetBlockHit(Vector3i(a_NBT.GetInt(InBlockXIdx), a_NBT.GetInt(InBlockYIdx), a_NBT.GetInt(InBlockZIdx)));
}
// Store the new arrow in the entities list:
a_Entities.push_back(Arrow.release());
}
@@ -2474,8 +2483,6 @@ bool cWSSAnvil::LoadProjectileBaseFromNBT(cProjectileEntity & a_Entity, const cP
}
a_Entity.SetIsInGround(IsInGround);
// TODO: Load inTile, TileCoords
return true;
}