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

Use hasHandlers() on more warm-hot events

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-08-23 14:35:53 +01:00
parent d03e4d17ec
commit f4d5605de1
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/world/World.php
View File

@ -694,16 +694,19 @@ class World implements ChunkManager{
*/ */
public function addSound(Vector3 $pos, Sound $sound, ?array $players = null) : void{ public function addSound(Vector3 $pos, Sound $sound, ?array $players = null) : void{
$players ??= $this->getViewersForPosition($pos); $players ??= $this->getViewersForPosition($pos);
$ev = new WorldSoundEvent($this, $sound, $pos, $players);
$ev->call(); if(WorldSoundEvent::hasHandlers()){
$ev = new WorldSoundEvent($this, $sound, $pos, $players);
$ev->call();
if($ev->isCancelled()){
return;
}
if($ev->isCancelled()){ $sound = $ev->getSound();
return; $players = $ev->getRecipients();
} }
$pk = $ev->getSound()->encode($pos); $pk = $sound->encode($pos);
$players = $ev->getRecipients();
if(count($pk) > 0){ if(count($pk) > 0){
if($players === $this->getViewersForPosition($pos)){ if($players === $this->getViewersForPosition($pos)){
foreach($pk as $e){ foreach($pk as $e){
@ -720,23 +723,26 @@ class World implements ChunkManager{
*/ */
public function addParticle(Vector3 $pos, Particle $particle, ?array $players = null) : void{ public function addParticle(Vector3 $pos, Particle $particle, ?array $players = null) : void{
$players ??= $this->getViewersForPosition($pos); $players ??= $this->getViewersForPosition($pos);
$ev = new WorldParticleEvent($this, $particle, $pos, $players);
$ev->call(); if(WorldParticleEvent::hasHandlers()){
$ev = new WorldParticleEvent($this, $particle, $pos, $players);
$ev->call();
if($ev->isCancelled()){
return;
}
if($ev->isCancelled()){ $particle = $ev->getParticle();
return; $players = $ev->getRecipients();
} }
$pk = $ev->getParticle()->encode($pos); $pk = $particle->encode($pos);
$players = $ev->getRecipients();
if(count($pk) > 0){ if(count($pk) > 0){
if($players === $this->getViewersForPosition($pos)){ if($players === $this->getViewersForPosition($pos)){
foreach($pk as $e){ foreach($pk as $e){
$this->broadcastPacketToViewers($pos, $e); $this->broadcastPacketToViewers($pos, $e);
} }
}else{ }else{
NetworkBroadcastUtils::broadcastPackets($this->filterViewersForPosition($pos, $ev->getRecipients()), $pk); NetworkBroadcastUtils::broadcastPackets($this->filterViewersForPosition($pos, $players), $pk);
} }
} }
} }
@ -2517,7 +2523,9 @@ class World implements ChunkManager{
} }
if($oldChunk === null){ if($oldChunk === null){
(new ChunkLoadEvent($this, $chunkX, $chunkZ, $chunk, true))->call(); if(ChunkLoadEvent::hasHandlers()){
(new ChunkLoadEvent($this, $chunkX, $chunkZ, $chunk, true))->call();
}
foreach($this->getChunkListeners($chunkX, $chunkZ) as $listener){ foreach($this->getChunkListeners($chunkX, $chunkZ) as $listener){
$listener->onChunkLoaded($chunkX, $chunkZ, $chunk); $listener->onChunkLoaded($chunkX, $chunkZ, $chunk);
@ -2791,7 +2799,9 @@ class World implements ChunkManager{
$this->initChunk($x, $z, $chunkData); $this->initChunk($x, $z, $chunkData);
(new ChunkLoadEvent($this, $x, $z, $this->chunks[$chunkHash], false))->call(); if(ChunkLoadEvent::hasHandlers()){
(new ChunkLoadEvent($this, $x, $z, $this->chunks[$chunkHash], false))->call();
}
if(!$this->isChunkInUse($x, $z)){ if(!$this->isChunkInUse($x, $z)){
$this->logger->debug("Newly loaded chunk $x $z has no loaders registered, will be unloaded at next available opportunity"); $this->logger->debug("Newly loaded chunk $x $z has no loaders registered, will be unloaded at next available opportunity");
@ -2904,12 +2914,14 @@ class World implements ChunkManager{
$chunk = $this->chunks[$chunkHash] ?? null; $chunk = $this->chunks[$chunkHash] ?? null;
if($chunk !== null){ if($chunk !== null){
$ev = new ChunkUnloadEvent($this, $x, $z, $chunk); if(ChunkUnloadEvent::hasHandlers()){
$ev->call(); $ev = new ChunkUnloadEvent($this, $x, $z, $chunk);
if($ev->isCancelled()){ $ev->call();
$this->timings->doChunkUnload->stopTiming(); if($ev->isCancelled()){
$this->timings->doChunkUnload->stopTiming();
return false; return false;
}
} }
if($trySave && $this->getAutoSave()){ if($trySave && $this->getAutoSave()){
@ -3366,7 +3378,9 @@ class World implements ChunkManager{
} }
if(($oldChunk === null || !$oldChunk->isPopulated()) && $chunk->isPopulated()){ if(($oldChunk === null || !$oldChunk->isPopulated()) && $chunk->isPopulated()){
(new ChunkPopulateEvent($this, $x, $z, $chunk))->call(); if(ChunkPopulateEvent::hasHandlers()){
(new ChunkPopulateEvent($this, $x, $z, $chunk))->call();
}
foreach($this->getChunkListeners($x, $z) as $listener){ foreach($this->getChunkListeners($x, $z) as $listener){
$listener->onChunkPopulated($x, $z, $chunk); $listener->onChunkPopulated($x, $z, $chunk);