Added ProjectileHitEvent

This commit is contained in:
Shoghi Cervantes 2014-10-08 17:04:35 +02:00
parent 62af784d37
commit c52dc58d6f
3 changed files with 55 additions and 4 deletions

View File

@ -26,6 +26,7 @@ use pocketmine\event\entity\EntityCombustByEntityEvent;
use pocketmine\event\entity\EntityDamageByEntityEvent;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\entity\EntityRegainHealthEvent;
use pocketmine\event\entity\ProjectileHitEvent;
use pocketmine\level\format\FullChunk;
use pocketmine\level\MovingObjectPosition;
use pocketmine\math\Vector3;
@ -118,6 +119,9 @@ class Arrow extends Projectile{
if($movingObjectPosition !== null){
if($movingObjectPosition->entityHit !== null){
$this->server->getPluginManager()->callEvent(new ProjectileHitEvent($this));
$motion = sqrt($this->motionX ** 2 + $this->motionY ** 2 + $this->motionZ ** 2);
$damage = ceil($motion * $this->damage);
@ -144,10 +148,12 @@ class Arrow extends Projectile{
$this->move($this->motionX, $this->motionY, $this->motionZ);
if($this->onGround){
if($this->onGround and ($this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0)){
$this->motionX = 0;
$this->motionY = 0;
$this->motionZ = 0;
$this->server->getPluginManager()->callEvent(new ProjectileHitEvent($this));
}
if($this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0){

View File

@ -0,0 +1,45 @@
<?php
/**
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
namespace pocketmine\event\entity;
use pocketmine\entity\Projectile;
use pocketmine\event\Cancellable;
class ProjectileHitEvent extends EntityEvent{
public static $handlerList = null;
/**
* @param Projectile $entity
*/
public function __construct(Projectile $entity){
$this->entity = $entity;
}
/**
* @return Projectile
*/
public function getEntity(){
return $this->entity;
}
}

View File

@ -28,10 +28,10 @@ class ProjectileLaunchEvent extends EntityEvent implements Cancellable{
public static $handlerList = null;
/**
* @param Projectile $item
* @param Projectile $entity
*/
public function __construct(Projectile $item){
$this->entity = $item;
public function __construct(Projectile $entity){
$this->entity = $entity;
}