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

Implemented critical hits (#1929)

Browse Source
This commit is contained in:
Encritary 2018-02-19 15:14:32 +05:00 committed by Dylan K. Taylor
parent cbbed6a6c1
commit ad8d67137e
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/Player.php
View File

@ -2411,6 +2411,10 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$ev->setCancelled(); $ev->setCancelled();
} }
if(!$this->isSprinting() and !$this->isFlying() and $this->fallDistance > 0 and !$this->hasEffect(Effect::BLINDNESS) and !$this->isInsideOfWater()){
$ev->setDamage($ev->getFinalDamage() / 2, EntityDamageEvent::MODIFIER_CRITICAL);
}
$target->attack($ev); $target->attack($ev);
if($ev->isCancelled()){ if($ev->isCancelled()){
@ -2420,6 +2424,16 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
return true; return true;
} }
if($ev->getDamage(EntityDamageEvent::MODIFIER_CRITICAL) > 0){
$pk = new AnimatePacket();
$pk->action = AnimatePacket::ACTION_CRITICAL_HIT;
$pk->entityRuntimeId = $target->getId();
$this->server->broadcastPacket($target->getViewers(), $pk);
if($target instanceof Player){
$target->dataPacket($pk);
}
}
if($this->isSurvival()){ if($this->isSurvival()){
if($heldItem->useOn($target)){ if($heldItem->useOn($target)){
$this->inventory->setItemInHand($heldItem); $this->inventory->setItemInHand($heldItem);

1
src/pocketmine/event/entity/EntityDamageEvent.php
View File

@ -39,6 +39,7 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
public const MODIFIER_RESISTANCE = 4; public const MODIFIER_RESISTANCE = 4;
public const MODIFIER_ABSORPTION = 5; public const MODIFIER_ABSORPTION = 5;
public const MODIFIER_ARMOR_ENCHANTMENTS = 6; public const MODIFIER_ARMOR_ENCHANTMENTS = 6;
public const MODIFIER_CRITICAL = 7;
public const CAUSE_CONTACT = 0; public const CAUSE_CONTACT = 0;
public const CAUSE_ENTITY_ATTACK = 1; public const CAUSE_ENTITY_ATTACK = 1;