water damage rewroked, small rotation changes

This commit is contained in:
GameHerobrine 2023-10-30 02:57:07 +03:00
parent adf84efbd7
commit 0dacbe0b36
5 changed files with 48 additions and 23 deletions

View file

@ -33,6 +33,10 @@ class MobController
$this->jumping = $b;
}
public function isRotationCompleted(){
return $this->finalHeadYaw === $this->entity->headYaw;
}
public function moveNonInstant($x, $y, $z){
if($x == 0 && $y == 0 && $z == 0){
return false;
@ -87,7 +91,7 @@ class MobController
break;
}
$this->faceEntity($ox, $oy, $oz);
if($this->entity->knockbackTime <= 0){
if($this->entity->knockbackTime <= 0 && $this->isRotationCompleted()){
$this->entity->moveEntityWithOffset($ox, $oy, $oz);
}
return true;

View file

@ -4,7 +4,7 @@ class TaskLookAtPlayer extends TaskBase{
public $target = false;
private $state, $yaw, $pitch;
public function canBeExecuted(EntityAI $ai){
return !$ai->entity->inPanic && lcg_value() < 0.02 && !$ai->entity->isMovingHorizontally() && !$ai->isStarted("TaskLookAround") && !$ai->isStarted("TaskTempt") && !$ai->entity->hasPath();
return !$ai->entity->inPanic && lcg_value() < 0.02 && !$ai->entity->isMovingHorizontally() && !$ai->isStarted("TaskLookAround") && !$ai->isStarted("TaskTempt") && !$ai->isStarted("TaskPanic") && !$ai->entity->hasPath();
}
protected function findTarget($e, $r){
@ -61,6 +61,7 @@ class TaskLookAtPlayer extends TaskBase{
public function onEnd(EntityAI $ai){
unset($this->target);
$ai->entity->pitch = 0;
$ai->entity->sendMoveUpdate();
}
}