mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-04 09:10:00 +00:00
Code Issues Projects Releases Wiki Activity

Improved knockback motion

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-09-24 16:17:04 +02:00
parent b88f19bb74
commit 6cb7e36f8a
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pocketmine/entity/Living.php
View File

@ -62,7 +62,8 @@ abstract class Living extends Entity implements Damageable{
public function hasLineOfSight(Entity $entity){ public function hasLineOfSight(Entity $entity){
//TODO: head height //TODO: head height
return $this->getLevel()->rayTraceBlocks(new Vector3($this->x, $this->y + $this->height, $this->z), new Vector3($entity->x, $entity->y + $entity->height, $entity->z)) === null; return true;
//return $this->getLevel()->rayTraceBlocks(new Vector3($this->x, $this->y + $this->height, $this->z), new Vector3($entity->x, $entity->y + $entity->height, $entity->z)) === null;
} }
public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){ public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
@ -78,21 +79,40 @@ abstract class Living extends Entity implements Damageable{
$pk->event = 2; //Ouch! $pk->event = 2; //Ouch!
Server::broadcastPacket($this->hasSpawned, $pk); Server::broadcastPacket($this->hasSpawned, $pk);
$this->setLastDamageCause($source); $this->setLastDamageCause($source);
$motion = new Vector3(0, 0, 0);
if($source instanceof EntityDamageByEntityEvent){ if($source instanceof EntityDamageByEntityEvent){
$e = $source->getDamager(); $e = $source->getDamager();
$deltaX = $this->x - $e->x; $deltaX = $this->x - $e->x;
$deltaZ = $this->z - $e->z; $deltaZ = $this->z - $e->z;
$yaw = atan2($deltaX, $deltaZ); $yaw = atan2($deltaX, $deltaZ);
$motion->x = sin($yaw) * 0.5; $this->knockBack($e, $damage, sin($yaw), cos($yaw));
$motion->z = cos($yaw) * 0.5;
} }
$this->setMotion($motion);
$this->setHealth($this->getHealth() - $damage); $this->setHealth($this->getHealth() - $damage);
$this->attackTime = 10; //0.5 seconds cooldown $this->attackTime = 10; //0.5 seconds cooldown
} }
public function knockBack(Entity $attacker, $damage, $x, $z){
$f = sqrt($x ** 2 + $z ** 2);
$base = 0.4;
$motion = new Vector3($this->motionX, $this->motionY, $this->motionZ);
$motion->x /= 2;
$motion->y /= 2;
$motion->z /= 2;
$motion->x += ($x / $f) * $base;
$motion->y += $base;
$motion->z += ($z / $f) * $base;
if($motion->y > $base){
$motion->y = $base;
}
$this->setMotion($motion);
}
public function heal($amount){ public function heal($amount){
$this->server->getPluginManager()->callEvent($ev = new EntityRegainHealthEvent($this, $amount)); $this->server->getPluginManager()->callEvent($ev = new EntityRegainHealthEvent($this, $amount));
if($ev->isCancelled()){ if($ev->isCancelled()){