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

Merge branch 'release/3.3'

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-10-05 18:29:37 +01:00
parent 495a0b1dc2 495fdbd19f
commit 4608ecde9b
12 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/network/Network.php
View File

@ -94,7 +94,7 @@ class Network{
$logger->logException($e);
}
$this->server->getPluginManager()->callEvent(new NetworkInterfaceCrashEvent($interface, $e));
(new NetworkInterfaceCrashEvent($interface, $e))->call();
$interface->emergencyShutdown();
$this->unregisterInterface($interface);
@ -113,7 +113,8 @@ class Network{
* @param NetworkInterface $interface
*/
public function registerInterface(NetworkInterface $interface) : void{
$this->server->getPluginManager()->callEvent($ev = new NetworkInterfaceRegisterEvent($interface));
$ev = new NetworkInterfaceRegisterEvent($interface);
$ev->call();
if(!$ev->isCancelled()){
$interface->start();
$this->interfaces[$hash = spl_object_hash($interface)] = $interface;
@ -129,7 +130,7 @@ class Network{
* @param NetworkInterface $interface
*/
public function unregisterInterface(NetworkInterface $interface) : void{
$this->server->getPluginManager()->callEvent(new NetworkInterfaceUnregisterEvent($interface));
(new NetworkInterfaceUnregisterEvent($interface))->call();
unset($this->interfaces[$hash = spl_object_hash($interface)], $this->advancedInterfaces[$hash]);
}

9
src/pocketmine/network/mcpe/NetworkSession.php
View File

@ -92,7 +92,8 @@ class NetworkSession{
}
protected function createPlayer() : void{
$this->server->getPluginManager()->callEvent($ev = new PlayerCreationEvent($this));
$ev = new PlayerCreationEvent($this);
$ev->call();
$class = $ev->getPlayerClass();
/**
@ -201,7 +202,8 @@ class NetworkSession{
$this->server->getLogger()->debug("Still " . strlen($remains) . " bytes unread in " . $packet->getName() . ": 0x" . bin2hex($remains));
}
$this->server->getPluginManager()->callEvent($ev = new DataPacketReceiveEvent($this->player, $packet));
$ev = new DataPacketReceiveEvent($this->player, $packet);
$ev->call();
if(!$ev->isCancelled() and !$packet->handle($this->handler)){
$this->server->getLogger()->debug("Unhandled " . $packet->getName() . " received from " . $this->player->getName() . ": 0x" . bin2hex($packet->buffer));
}
@ -213,7 +215,8 @@ class NetworkSession{
$timings = Timings::getSendDataPacketTimings($packet);
$timings->startTiming();
try{
$this->server->getPluginManager()->callEvent($ev = new DataPacketSendEvent($this->player, $packet));
$ev = new DataPacketSendEvent($this->player, $packet);
$ev->call();
if($ev->isCancelled()){
return false;
}