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

Merge pull request #844 from mc-server/ProjectileHitBlock

Browse Source 
OnProjectileHitBlock tweak.
This commit is contained in:
Mattes D
2014-06-01 20:10:03 +02:00
parent 750333855c 319169eafb
commit 61edb83ce5
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Entities/ProjectileEntity.cpp
View File

@@ -76,12 +76,12 @@ protected:
eBlockFace Face;
if (bb.CalcLineIntersection(Line1, Line2, LineCoeff, Face))
{
if (cPluginManager::Get()->CallHookProjectileHitBlock(*m_Projectile))
Vector3d Intersection = Line1 + m_Projectile->GetSpeed() * LineCoeff;
if (cPluginManager::Get()->CallHookProjectileHitBlock(*m_Projectile, a_BlockX, a_BlockY, a_BlockZ, Face, &Intersection))
{
return false;
}
Vector3d Intersection = Line1 + m_Projectile->GetSpeed() * LineCoeff;
m_Projectile->OnHitSolidBlock(Intersection, Face);
return true;
}