summaryrefslogtreecommitdiffstats
path: root/src/Entities/ProjectileEntity.cpp
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-01-16 15:58:49 +0100
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-01-16 15:58:49 +0100
commitdc33276dda5beacf9470d6060f72730118ba550d (patch)
tree6ebcb9d63146b2626311220b69b0c311e2a74c94 /src/Entities/ProjectileEntity.cpp
parentMerge pull request #2875 from LogicParrot/fallDamage (diff)
parentFix crash when tamed wolf is hit by arrows (diff)
downloadcuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar.gz
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar.bz2
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar.lz
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar.xz
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar.zst
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.zip
Diffstat (limited to 'src/Entities/ProjectileEntity.cpp')
-rw-r--r--src/Entities/ProjectileEntity.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index 4c89ea965..bb08f38d9 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -316,12 +316,13 @@ void cProjectileEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_Hi
{
if (a_EntityHit.IsPawn() && (GetCreatorName() != "")) // If we're hitting a mob or a player and we were created by a player
{
+
class cNotifyWolves : public cEntityCallback
{
public:
- cEntity * m_EntityHit;
+ cPawn * m_EntityHit;
- cNotifyWolves(cEntity * a_Entity) :
+ cNotifyWolves(cPawn * a_Entity) :
m_EntityHit(a_Entity)
{
}
@@ -331,7 +332,7 @@ void cProjectileEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_Hi
static_cast<cPlayer*>(a_Player)->NotifyFriendlyWolves(m_EntityHit);
return true;
}
- } Callback(&a_EntityHit);
+ } Callback(static_cast<cPawn*>(&a_EntityHit));
m_World->DoWithEntityByID(GetCreatorUniqueID(), Callback);
}