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

Zombies and Skeletons don't walk into the sun anymore.

Browse Source
This commit is contained in:
STRWarrior 2013-11-02 20:45:51 +01:00
parent 52d956ccf3
commit 3dc3e5eca7
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/Mobs/Skeleton.cpp
View File

@ -3,6 +3,8 @@
#include "Skeleton.h" #include "Skeleton.h"
#include "../World.h" #include "../World.h"
#include "../Entities/ProjectileEntity.h"
#include "../Entities/Entity.h"
@ -28,3 +30,16 @@ void cSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cSkeleton::MoveToPosition(const Vector3f & a_Position)
{
m_Destination = a_Position;
// If the destination is in the sun and if it is not night AND the skeleton isn't on fire then block the movement.
if ((m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15) && (m_World->GetTimeOfDay() < 13187) && !IsOnFire())
{
m_bMovingToDestination = false;
return;
}
m_bMovingToDestination = true;
}

1
source/Mobs/Skeleton.h
View File

@ -18,6 +18,7 @@ public:
CLASS_PROTODEF(cSkeleton); CLASS_PROTODEF(cSkeleton);
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
virtual void MoveToPosition(const Vector3f & a_Position) override;
bool IsWither(void) const { return m_bIsWither; }; bool IsWither(void) const { return m_bIsWither; };
private: private:

15
source/Mobs/Zombie.cpp
View File

@ -30,3 +30,18 @@ void cZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cZombie::MoveToPosition(const Vector3f & a_Position)
{
m_Destination = a_Position;
// If the destination is in the sun and if it is not night AND the skeleton isn't on fire then block the movement.
if ((m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15) && (m_World->GetTimeOfDay() < 13187) && !IsOnFire())
{
m_bMovingToDestination = false;
return;
}
m_bMovingToDestination = true;
}

1
source/Mobs/Zombie.h
View File

@ -17,6 +17,7 @@ public:
CLASS_PROTODEF(cZombie); CLASS_PROTODEF(cZombie);
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
virtual void MoveToPosition(const Vector3f & a_Position) override;
bool IsVillagerZombie(void) const {return m_bIsVillagerZombie; } bool IsVillagerZombie(void) const {return m_bIsVillagerZombie; }
bool IsConverting(void) const {return m_bIsConverting; } bool IsConverting(void) const {return m_bIsConverting; }