diff --git a/src/entity/Animal.php b/src/entity/Animal.php index 0f5b2e3c..02dcdf7a 100644 --- a/src/entity/Animal.php +++ b/src/entity/Animal.php @@ -22,6 +22,7 @@ abstract class Animal extends Creature implements Ageable, Breedable{ public function harm($dmg, $cause = "generic", $force = false){ $ret = parent::harm($dmg, $cause, $force); $this->inPanic |= ($ret && is_numeric($cause)); + $this->inLove = false; return $ret; } @@ -32,7 +33,7 @@ abstract class Animal extends Creature implements Ageable, Breedable{ public function breed(){ $c = $this->spawnChild(); if($this->server->dhandle("entity.animal.breed", ["parent" => $this, "child" => $c]) !== false){ - $c->parent = &$this; + $c->parent = $this; $this->server->api->entity->spawnToAll($c); } } diff --git a/src/entity/Creature.php b/src/entity/Creature.php index 586e369f..b29d4a5d 100644 --- a/src/entity/Creature.php +++ b/src/entity/Creature.php @@ -26,7 +26,7 @@ abstract class Creature extends Living{ } public function getSpeedModifer(){ - return $this->speedModifer * ($this->inPanic ? 1.0 : 0.7); + return $this->speedModifer * ($this->inPanic ? 1.5 : 1.0); } public function getArmorValue(){ return 2; diff --git a/src/entity/Entity.php b/src/entity/Entity.php index d3670c47..e5958e9c 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -579,7 +579,7 @@ class Entity extends Position for($z = $z0; $z < $z1; ++$z){ $pos = new Vector3($x, $y, $z); $b = $this->level->getBlock($pos); - if(($b->y == ($y1 - 1) && $b->getID() === WATER) || $b->getID() === STILL_WATER){ + if($b->y == ($y1 - 1) && ($b->getID() === WATER || $b->getID() === STILL_WATER)){ $water = true; } if($b != false && $b->isSolid){ @@ -603,6 +603,15 @@ class Entity extends Position $horizontalMultiplyFactor = $b->slipperiness * 0.91; } } + if($this->inWater){ + $this->speedX *= 0.8; + $this->speedY *= 0.8; + $this->speedZ *= 0.8; + }else{ + $this->speedX *= $horizontalMultiplyFactor; + $this->speedY *= 0.98; + $this->speedZ *= $horizontalMultiplyFactor; + } if($this->speedX != 0){ $this->x += $this->speedX; $update = true; @@ -639,9 +648,10 @@ class Entity extends Position $update = true; } $this->onGround = $support; - + + if($this->hasGravity){ - $this->speedY -= ($this->class === ENTITY_FALLING) ? 0.04 : ($this->class === ENTITY_ITEM ? 0.06 : 0.08); // TODO: replace with $gravity + $this->speedY -= $this->inWater ? 0.02 : (($this->class === ENTITY_FALLING) ? 0.04 : ($this->class === ENTITY_ITEM ? 0.06 : 0.08)); // TODO: replace with $gravity $update = true; } elseif($this->lastX != $this->x || $this->lastZ != $this->z || $this->lastY != $this->z){ // $this->speedX = 0; @@ -659,9 +669,7 @@ class Entity extends Position $this->server->api->handle("entity.motion", $this); } } - $this->speedX *= $horizontalMultiplyFactor; - $this->speedY *= 0.98; - $this->speedZ *= $horizontalMultiplyFactor; + } elseif($this->player instanceof Player){ if($isFlying === true and ($this->player->gamemode & 0x01) === 0x00){ if($this->fallY === false or $this->fallStart === false){ diff --git a/src/entity/ai/tasks/TaskPanic.php b/src/entity/ai/tasks/TaskPanic.php index dcedcf8e..c3f52233 100644 --- a/src/entity/ai/tasks/TaskPanic.php +++ b/src/entity/ai/tasks/TaskPanic.php @@ -5,7 +5,7 @@ class TaskPanic extends TaskBase protected $randX = 2, $randZ = 2; public function onStart(EntityAI $ai) { - $this->selfCounter = mt_rand(60, 120); + $this->selfCounter = 60; $this->regenerateRandXZ(); }