summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSafwat Halaby <SafwatHalaby@users.noreply.github.com>2015-05-30 09:31:26 +0200
committerSafwat Halaby <SafwatHalaby@users.noreply.github.com>2015-05-30 09:31:26 +0200
commit054d2cd451f7f9611983e3f5e22450d83935ef91 (patch)
tree313449e70f063965b0ae0ba5ad205b4e9f1b4333
parentMerge pull request #2165 from SafwatHalaby/creeper (diff)
parentDisabled squid and Guardian Pathfinding (diff)
downloadcuberite-054d2cd451f7f9611983e3f5e22450d83935ef91.tar
cuberite-054d2cd451f7f9611983e3f5e22450d83935ef91.tar.gz
cuberite-054d2cd451f7f9611983e3f5e22450d83935ef91.tar.bz2
cuberite-054d2cd451f7f9611983e3f5e22450d83935ef91.tar.lz
cuberite-054d2cd451f7f9611983e3f5e22450d83935ef91.tar.xz
cuberite-054d2cd451f7f9611983e3f5e22450d83935ef91.tar.zst
cuberite-054d2cd451f7f9611983e3f5e22450d83935ef91.zip
-rw-r--r--src/Mobs/Guardian.cpp3
-rw-r--r--src/Mobs/Squid.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Mobs/Guardian.cpp b/src/Mobs/Guardian.cpp
index cfe7861a6..1429e2b13 100644
--- a/src/Mobs/Guardian.cpp
+++ b/src/Mobs/Guardian.cpp
@@ -37,9 +37,10 @@ void cGuardian::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cGuardian::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
+ m_IsFollowingPath = false; // Disable Pathfinding until it's fixed. TODO
+
// We must first process current location, and only then tick, otherwise we risk processing a location in a chunk
// that is not where the entity currently resides (FS #411)
-
Vector3d Pos = GetPosition();
// TODO: Not a real behavior, but cool :D
diff --git a/src/Mobs/Squid.cpp b/src/Mobs/Squid.cpp
index d148d65f3..30fbfa1ff 100644
--- a/src/Mobs/Squid.cpp
+++ b/src/Mobs/Squid.cpp
@@ -35,9 +35,10 @@ void cSquid::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cSquid::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
+ m_IsFollowingPath = false; // Disable Pathfinding until it's fixed. TODO
+
// We must first process current location, and only then tick, otherwise we risk processing a location in a chunk
// that is not where the entity currently resides (FS #411)
-
Vector3d Pos = GetPosition();
// TODO: Not a real behavior, but cool :D