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

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-01-20 16:30:49 +00:00
commit 86bcc49972
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/event/player/PlayerInteractEvent.php
View File

@ -31,7 +31,8 @@ use pocketmine\math\Vector3;
use pocketmine\player\Player; use pocketmine\player\Player;
/** /**
* Called when a player interacts or touches a block (including air?) * Called when a player interacts or touches a block.
* This is called for both left click (start break) and right click (use).
*/ */
class PlayerInteractEvent extends PlayerEvent implements Cancellable{ class PlayerInteractEvent extends PlayerEvent implements Cancellable{
use CancellableTrait; use CancellableTrait;

2
src/world/World.php
View File

@ -878,7 +878,7 @@ class World implements ChunkManager{
//Update entities that need update //Update entities that need update
Timings::$tickEntity->startTiming(); Timings::$tickEntity->startTiming();
foreach($this->updateEntities as $id => $entity){ foreach($this->updateEntities as $id => $entity){
if($entity->isClosed() or !$entity->onUpdate($currentTick)){ if($entity->isClosed() or $entity->isFlaggedForDespawn() or !$entity->onUpdate($currentTick)){
unset($this->updateEntities[$id]); unset($this->updateEntities[$id]);
} }
if($entity->isFlaggedForDespawn()){ if($entity->isFlaggedForDespawn()){