Fix support for autodetecting server for ladders

Chaarizard · Apr 11, 2014 · f525c08 · f525c08
1 parent 5f0db1e
commit f525c08
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/dispatcher.lib.php b/lib/dispatcher.lib.php
@@ -291,7 +291,7 @@ public function prepreplay($dispatcher, &$reqData, &$out) {
 
 		$server = $dispatcher->findServer();
 		if (!$server) {
-			$out['errorip'] = $this->getIp();
+			$out['errorip'] = $dispatcher->getIp();
 			return;
 		}
 		if (
@@ -338,7 +338,7 @@ public function uploadreplay($dispatcher, &$reqData, &$out) {
 	public function invalidatecss($dispatcher, &$reqData, &$out) {
 		$server = $dispatcher->findServer();
 		if (!$server) {
-			$out['errorip'] = $this->getIp();
+			$out['errorip'] = $dispatcher->getIp();
 			return;
 		}
 		// No need to sanitise $server['id'] because it should be safe already.
@@ -487,7 +487,7 @@ public function ladderupdate($dispatcher, &$reqData, &$out) {
 
 		$server = $dispatcher->findServer();
 		if (!$server) {
-			$out = 0;
+			$out['errorip'] = $dispatcher->getIp();
 			return;
 		}
 
@@ -524,12 +524,12 @@ public function ladderget($dispatcher, &$reqData, &$out) {
 	}
 
 	public function mmr($dispatcher, &$reqData, &$out) {
-		global $PokemonServers, $users;
+		global $PokemonServers;
 		include_once dirname(__FILE__) . '/ntbb-ladder.lib.php';
 
-		$server = @$PokemonServers[@$reqData['serverid']];
+		$server = $dispatcher->findServer();
 		if (!$server) {
-			$out['errorip'] = $users->getIp();
+			$out['errorip'] = $dispatcher->getIp();
 			return;
 		}