From 5f2e65d60898c3c58f9db5810140e5242b026843 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sat, 23 May 2020 12:28:12 +0100
Subject: [PATCH] QueryHandler: be honest about dependency on Server

---
 src/Server.php                     | 2 +-
 src/network/query/QueryHandler.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Server.php b/src/Server.php
index 24c1a509c7..59a09aa404 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -1084,7 +1084,7 @@ class Server{
 			$this->logger->info($this->getLanguage()->translateString("pocketmine.server.networkStart", [$this->getIp(), $this->getPort()]));
 
 			if($this->getConfigBool("enable-query", true)){
-				$this->network->registerRawPacketHandler(new QueryHandler());
+				$this->network->registerRawPacketHandler(new QueryHandler($this));
 			}
 
 			foreach($this->getIPBans()->getEntries() as $entry){
diff --git a/src/network/query/QueryHandler.php b/src/network/query/QueryHandler.php
index 47941e27c6..b88e47b739 100644
--- a/src/network/query/QueryHandler.php
+++ b/src/network/query/QueryHandler.php
@@ -53,8 +53,8 @@ class QueryHandler implements RawPacketHandler{
 	public const HANDSHAKE = 9;
 	public const STATISTICS = 0;
 
-	public function __construct(){
-		$this->server = Server::getInstance();
+	public function __construct(Server $server){
+		$this->server = $server;
 		$this->logger = new \PrefixedLogger($this->server->getLogger(), "Query Handler");
 		$addr = $this->server->getIp();
 		$port = $this->server->getPort();