diff --git a/src/entity/ai/MobController.php b/src/entity/ai/MobController.php index 7b1b4973..78d92078 100644 --- a/src/entity/ai/MobController.php +++ b/src/entity/ai/MobController.php @@ -37,7 +37,7 @@ class MobController return $this->finalHeadYaw === $this->entity->headYaw; } - public function moveNonInstant($x, $y, $z){ + public function moveNonInstant($x, $y, $z, $camera = true){ if($x == 0 && $y == 0 && $z == 0){ return false; } @@ -90,8 +90,8 @@ class MobController } break; } - $this->faceEntity($ox, $oy, $oz); - if($this->entity->knockbackTime <= 0){// && $this->isRotationCompleted()){ + if($camera) $this->faceEntity($ox, $oy, $oz); + if($this->entity->knockbackTime <= 0 && $this->isRotationCompleted()){ $this->entity->moveEntityWithOffset($ox, $oy, $oz); } return true; @@ -106,13 +106,13 @@ class MobController } public function rotateTick(){ //TODO handle more rotation - $w180 = Utils::wrapAngleTo180($this->finalHeadYaw - $this->entity->headYaw); + $w180 = Utils::wrapAngleTo180($this->finalHeadYaw - $this->entity->headYaw); $w180min = min(abs($w180), 20)*Utils::getSign($w180); $this->entity->headYaw = Utils::wrapAngleTo360($this->entity->headYaw + $w180min); } - public function moveTo($x, $y, $z){ - return $this->moveNonInstant($x - floor($this->entity->x), $y - floor($this->entity->y), $z - floor($this->entity->z)); + public function moveTo($x, $y, $z, $camera = true){ + return $this->moveNonInstant($x - floor($this->entity->x), $y - floor($this->entity->y), $z - floor($this->entity->z), $camera); } public function faceEntity($x, $y, $z){ @@ -130,7 +130,7 @@ class MobController $tan = $dz == 0 ? ($dx < 0 ? 180 : 0) : (90 - rad2deg(atan($dx / $dz))); $thetaOffset = $dz < 0 ? 90 : 270; $calcYaw = ($thetaOffset + $tan); - $this->finalHeadYaw = $this->entity->yaw = $calcYaw; + $this->finalHeadYaw = $this->entity->yaw = Utils::wrapAngleTo360($calcYaw); } public function lookOffset($x, $y, $z, $pitch = true){ @@ -138,7 +138,7 @@ class MobController $thetaOffset = $z < 0 ? 90 : 270; $calcYaw = $tan + $thetaOffset; - $this->entity->yaw = $this->finalHeadYaw = $calcYaw; + $this->entity->yaw = $this->finalHeadYaw = Utils::wrapAngleTo360($calcYaw); if($pitch){ $diff = sqrt($x * $x + $z * $z); diff --git a/src/entity/ai/tasks/TaskAttackPlayer.php b/src/entity/ai/tasks/TaskAttackPlayer.php index 66d2ec6c..e6ec7e1d 100644 --- a/src/entity/ai/tasks/TaskAttackPlayer.php +++ b/src/entity/ai/tasks/TaskAttackPlayer.php @@ -16,7 +16,7 @@ class TaskAttackPlayer extends TaskTempt return; } - $ai->mobController->moveTo($this->target->x - 0.5, floor($ai->entity->y), $this->target->z - 0.5); + $ai->mobController->moveTo($this->target->x - 0.5, floor($ai->entity->y), $this->target->z - 0.5, false); $ai->mobController->lookOn($this->target); $mult = $ai->entity instanceof Spider ? 1 : 2; $radius = ($ai->entity->width * $mult)*($ai->entity->width * $mult); diff --git a/src/entity/ai/tasks/TaskDestroyServerPerformance.php b/src/entity/ai/tasks/TaskDestroyServerPerformance.php index f0b6b40d..8d5d1444 100644 --- a/src/entity/ai/tasks/TaskDestroyServerPerformance.php +++ b/src/entity/ai/tasks/TaskDestroyServerPerformance.php @@ -21,7 +21,7 @@ class TaskDestroyServerPerformance extends TaskTempt return; } if(Utils::distance_noroot($this->target, $ai->entity) > 100){ - $ai->mobController->moveTo($this->target->x, floor($ai->entity->y), $this->target->z); + $ai->mobController->moveTo($this->target->x, floor($ai->entity->y), $this->target->z, false); }else{ //TODO move away } diff --git a/src/entity/ai/tasks/TaskRandomWalk.php b/src/entity/ai/tasks/TaskRandomWalk.php index 472f1333..82203ef0 100644 --- a/src/entity/ai/tasks/TaskRandomWalk.php +++ b/src/entity/ai/tasks/TaskRandomWalk.php @@ -31,7 +31,7 @@ class TaskRandomWalk extends TaskBase public function canBeExecuted(EntityAI $ai) { - if(($ai->entity instanceof Creeper && $ai->entity->isIgnited()) || $ai->entity->hasPath() || $ai->isStarted("TaskTempt")) { + if(($ai->entity instanceof Creeper && $ai->entity->isIgnited()) || $ai->entity->hasPath() || $ai->isStarted("TaskTempt") ||$ai->isStarted("TaskAttackPlayer")) { return false; } return !$ai->entity->inPanic && !$ai->isStarted("TaskEatTileGoal")&& !$ai->isStarted("TaskLookAround") && !$ai->isStarted("TaskLookAtPlayer") && mt_rand(0, 120) == 0; diff --git a/src/entity/ai/tasks/TaskTempt.php b/src/entity/ai/tasks/TaskTempt.php index b1313e46..d01fe0e2 100644 --- a/src/entity/ai/tasks/TaskTempt.php +++ b/src/entity/ai/tasks/TaskTempt.php @@ -23,7 +23,7 @@ class TaskTempt extends TaskBase return; } - $ai->mobController->moveTo($this->target->x - 0.5, floor($ai->entity->y), $this->target->z - 0.5); + $ai->mobController->moveTo($this->target->x - 0.5, floor($ai->entity->y), $this->target->z - 0.5, false); $ai->mobController->lookOn($this->target); }