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

Remove another NetworkSession <-> NetworkInterface cyclic dependency

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-06-26 18:22:32 +01:00
parent 7eaca6bbaa
commit 3f9493bcd0
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/event/player/PlayerCreationEvent.php
View File

@ -25,7 +25,6 @@ namespace pocketmine\event\player;
use pocketmine\event\Event; use pocketmine\event\Event;
use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\NetworkSession;
use pocketmine\network\NetworkInterface;
use pocketmine\player\Player; use pocketmine\player\Player;
use function is_a; use function is_a;
@ -50,13 +49,6 @@ class PlayerCreationEvent extends Event{
$this->session = $session; $this->session = $session;
} }
/**
* @return NetworkInterface
*/
public function getInterface() : NetworkInterface{
return $this->session->getInterface();
}
/** /**
* @return NetworkSession * @return NetworkSession
*/ */

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

@ -65,7 +65,6 @@ use pocketmine\network\mcpe\protocol\types\CommandParameter;
use pocketmine\network\mcpe\protocol\types\PlayerListEntry; use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
use pocketmine\network\mcpe\protocol\types\PlayerPermissions; use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
use pocketmine\network\mcpe\protocol\UpdateAttributesPacket; use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
use pocketmine\network\NetworkInterface;
use pocketmine\network\NetworkSessionManager; use pocketmine\network\NetworkSessionManager;
use pocketmine\player\GameMode; use pocketmine\player\GameMode;
use pocketmine\player\Player; use pocketmine\player\Player;
@ -100,8 +99,6 @@ class NetworkSession{
private $player = null; private $player = null;
/** @var NetworkSessionManager */ /** @var NetworkSessionManager */
private $manager; private $manager;
/** @var NetworkInterface */
private $interface;
/** @var string */ /** @var string */
private $ip; private $ip;
/** @var int */ /** @var int */
@ -140,10 +137,9 @@ class NetworkSession{
/** @var PacketSender */ /** @var PacketSender */
private $sender; private $sender;
public function __construct(Server $server, NetworkSessionManager $manager, NetworkInterface $interface, PacketSender $sender, string $ip, int $port){ public function __construct(Server $server, NetworkSessionManager $manager, PacketSender $sender, string $ip, int $port){
$this->server = $server; $this->server = $server;
$this->manager = $manager; $this->manager = $manager;
$this->interface = $interface;
$this->sender = $sender; $this->sender = $sender;
$this->ip = $ip; $this->ip = $ip;
$this->port = $port; $this->port = $port;
@ -209,10 +205,6 @@ class NetworkSession{
return $this->connected; return $this->connected;
} }
public function getInterface() : NetworkInterface{
return $this->interface;
}
/** /**
* @return string * @return string
*/ */

2
src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -133,7 +133,7 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
} }
public function openSession(int $sessionId, string $address, int $port, int $clientID) : void{ public function openSession(int $sessionId, string $address, int $port, int $clientID) : void{
$session = new NetworkSession($this->server, $this->network->getSessionManager(), $this, new RakLibPacketSender($sessionId, $this), $address, $port); $session = new NetworkSession($this->server, $this->network->getSessionManager(), new RakLibPacketSender($sessionId, $this), $address, $port);
$this->sessions[$sessionId] = $session; $this->sessions[$sessionId] = $session;
} }