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

Resolved #3937

Browse Source
This commit is contained in:
PEMapModder 2016-02-12 14:08:59 +08:00
parent e5937926cd
commit 3b51d2c217
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,11 +53,9 @@ use pocketmine\nbt\tag\Float;
use pocketmine\nbt\tag\Int;
use pocketmine\nbt\tag\Short;
use pocketmine\nbt\tag\String;
use pocketmine\network\Network;
use pocketmine\network\protocol\MobEffectPacket;
use pocketmine\network\protocol\RemoveEntityPacket;
use pocketmine\network\protocol\SetEntityDataPacket;
use pocketmine\Player;
use pocketmine\plugin\Plugin;
use pocketmine\Server;
@ -599,7 +597,8 @@ abstract class Entity extends Location implements Metadatable{
if($this->hasEffect(Effect::FIRE_RESISTANCE)
and $source->getCause() === EntityDamageEvent::CAUSE_FIRE
and $source->getCause() === EntityDamageEvent::CAUSE_FIRE_TICK
and $source->getCause() === EntityDamageEvent::CAUSE_LAVA){
and $source->getCause() === EntityDamageEvent::CAUSE_LAVA
){
$source->setCancelled();
}
@ -774,7 +773,7 @@ abstract class Entity extends Location implements Metadatable{
}
if($direction === 5){
$this->motionY = $force;
$this->motionZ = $force;
return true;
}
@ -1548,7 +1547,7 @@ abstract class Entity extends Location implements Metadatable{
}
/**
* @param int $propertyId;
* @param int $propertyId
* @param int $id
* @param bool $value
*/