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

Critical arrows, fixed arrow interception calculation

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-03-28 17:54:10 +01:00
parent 0a85ad0d1f
commit e0a6d0feab
8 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/Player.php
View File

@@ -1260,7 +1260,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$entity->scheduleUpdate();
}
if($entity instanceof Arrow and $entity->onGround){
if($entity instanceof Arrow and $entity->hadCollision){
if($entity->dead !== true){
$item = Item::get(Item::ARROW, 0, 1);
if($this->isSurvival() and !$this->inventory->canAddItem($item)){
@@ -1775,7 +1775,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
if($this->isSurvival()){
if(!$this->inventory->contains(Item::get(Item::ARROW, 0, 1))){
$this->inventory->sendContents($this);
return;
break;
}
}
@@ -1799,14 +1799,16 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$diff = ($this->server->getTick() - $this->startAction);
if($diff < 5){
$this->inventory->sendContents($this);
break;
}
$p = $diff / 20;
$f = min((($p ** 2) + $p * 2) / 3, 1) * 2;
if($f < 0.1){
$this->inventory->sendContents($this);
break;
}
$ev = new EntityShootBowEvent($this, $bow, Entity::createEntity("Arrow", $this->chunk, $nbt, $this), $f);
$ev = new EntityShootBowEvent($this, $bow, Entity::createEntity("Arrow", $this->chunk, $nbt, $this, $f == 2 ? true : false), $f);
$this->server->getPluginManager()->callEvent($ev);