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

Added Effects base, /effect and methods

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-03-15 23:11:12 +01:00
parent f9361aa931
commit 4383e272eb
13 changed files with 478 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/pocketmine/entity/Entity.php
View File

@@ -51,6 +51,7 @@ use pocketmine\nbt\tag\Float;
use pocketmine\nbt\tag\Short;
use pocketmine\nbt\tag\String;
use pocketmine\Network;
use pocketmine\network\protocol\MobEffectPacket;
use pocketmine\network\protocol\MovePlayerPacket;
use pocketmine\network\protocol\RemoveEntityPacket;
use pocketmine\network\protocol\SetEntityDataPacket;
@@ -75,6 +76,9 @@ abstract class Entity extends Location implements Metadatable{
*/
protected $hasSpawned = [];
/** @var Effect[] */
protected $effects = [];
protected $id;
public $passenger = null;
@@ -228,6 +232,53 @@ abstract class Entity extends Location implements Metadatable{
}
/**
* @return Effect[]
*/
public function getEffects(){
return $this->effects;
}
public function removeEffect($effectId){
if(isset($this->effects[$effectId])){
$pk = new MobEffectPacket();
$pk->eid = $this->getId();
$pk->eventId = MobEffectPacket::EVENT_REMOVE;
$pk->effectId = $effectId;
Server::broadcastPacket($this->getViewers(), $pk);
if($this instanceof Player){
$this->dataPacket($pk);
}
unset($this->effects[$effectId]);
}
}
public function hasEffect($effectId){
return isset($this->effects[$effectId]);
}
public function addEffect(Effect $effect){
$pk = new MobEffectPacket();
$pk->eid = $this->getId();
$pk->effectId = $effect->getId();
$pk->amplifier = $effect->getAmplifier();
$pk->particles = $effect->isVisible();
$pk->duration = $effect->getDuration();
if(isset($this->effects[$effect->getId()])){
$pk->eventId = MobEffectPacket::EVENT_MODIFY;
}else{
$pk->eventId = MobEffectPacket::EVENT_ADD;
}
Server::broadcastPacket($this->getViewers(), $pk);
if($this instanceof Player){
$this->dataPacket($pk);
}
$this->effects[$effect->getId()] = $effect;
}
/**
* @param int|string $type
* @param FullChunk $chunk
@@ -516,6 +567,7 @@ abstract class Entity extends Location implements Metadatable{
$isPlayer = $this instanceof Player;
if($this->dead === true){
$this->effects = [];
$this->despawnFromAll();
if(!$isPlayer){
$this->close();
@@ -525,6 +577,18 @@ abstract class Entity extends Location implements Metadatable{
return false;
}
if(count($this->effects) > 0){
foreach($this->effects as $effect){
if($effect->canTick()){
$effect->applyEffect($this);
}
$effect->setDuration($effect->getDuration() - $tickDiff);
if($effect->getDuration() <= 0){
$this->removeEffect($effect->getId());
}
}
}
$hasUpdate = false;
$this->checkBlockCollision();
@@ -542,7 +606,7 @@ abstract class Entity extends Location implements Metadatable{
$this->fireTicks = 0;
}
}else{
if(($this->fireTicks % 20) === 0 or $tickDiff > 20){
if(!$this->hasEffect(Effect::FIRE_RESISTANCE) and ($this->fireTicks % 20) === 0 or $tickDiff > 20){
$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FIRE_TICK, 1);
$this->attack($ev->getFinalDamage(), $ev);
}