Fixed DataPacketReceiveEvent, fixed packet receive timings, gave Player->handleDataPacket() a new use

This commit is contained in:
Dylan K. Taylor
2017-03-19 21:50:09 +00:00
parent be449b6106
commit 9c350dbe47
3 changed files with 19 additions and 17 deletions

View File

@ -3291,7 +3291,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
}
/**
* TODO: get rid of these remains, fix DataPacketReceiveEvent, fix timings
* Called when a packet is received from the client. This method will call DataPacketReceiveEvent.
*
* @param DataPacket $packet
*/
@ -3300,18 +3300,14 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
return;
}
$timings = Timings::getReceiveDataPacketTimings($packet);
$timings->startTiming();
$this->server->getPluginManager()->callEvent($ev = new DataPacketReceiveEvent($this, $packet));
if($ev->isCancelled()){
$timings->stopTiming();
return;
if(!$ev->isCancelled() and !$packet->handle($this)){
$this->server->getLogger()->debug("Unhandled " . get_class($packet) . " received from " . $this->getName());
}
$timings->stopTiming();
}