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

Revert "Replace ItemCallbacks with lambdas (#3948)"

Browse Source 
This reverts commit 496c337cdf.
This commit is contained in:
LogicParrot
2017-09-02 10:45:06 +03:00
committed by Alexander Harkness
parent 700bbdabf5
commit 49c443896d
67 changed files with 1832 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mobs/Enderman.cpp
View File

@@ -10,7 +10,8 @@
////////////////////////////////////////////////////////////////////////////////
// cPlayerLookCheck
class cPlayerLookCheck
class cPlayerLookCheck :
public cPlayerListCallback
{
public:
cPlayerLookCheck(Vector3d a_EndermanPos, int a_SightDistance) :
@@ -20,29 +21,29 @@ public:
{
}
bool operator () (cPlayer & a_Player)
virtual bool Item(cPlayer * a_Player) override
{
// Don't check players who cannot be targeted
if (!a_Player.CanMobsTarget())
if (!a_Player->CanMobsTarget())
{
return false;
}
// Don't check players who are more than SightDistance (64) blocks away
auto Direction = m_EndermanPos - a_Player.GetPosition();
auto Direction = m_EndermanPos - a_Player->GetPosition();
if (Direction.Length() > m_SightDistance)
{
return false;
}
// Don't check if the player has a pumpkin on his head
if (a_Player.GetEquippedHelmet().m_ItemType == E_BLOCK_PUMPKIN)
if (a_Player->GetEquippedHelmet().m_ItemType == E_BLOCK_PUMPKIN)
{
return false;
}
// If the player's crosshair is within 5 degrees of the enderman, it counts as looking
auto LookVector = a_Player.GetLookVector();
auto LookVector = a_Player->GetLookVector();
auto dot = Direction.Dot(LookVector);
if (dot <= cos(0.09)) // 0.09 rad ~ 5 degrees
{
@@ -50,13 +51,13 @@ public:
}
// TODO: Check if endermen are angered through water in Vanilla
if (!cLineBlockTracer::LineOfSightTrace(*a_Player.GetWorld(), m_EndermanPos, a_Player.GetPosition(), cLineBlockTracer::losAirWater))
if (!cLineBlockTracer::LineOfSightTrace(*a_Player->GetWorld(), m_EndermanPos, a_Player->GetPosition(), cLineBlockTracer::losAirWater))
{
// No direct line of sight
return false;
}
m_Player = &a_Player;
m_Player = a_Player;
return true;
}