mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 11:39:43 +00:00
fixed and reverted
This commit is contained in:
parent
bfc653a911
commit
5b8aee19fa
5 changed files with 12 additions and 12 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue