From df1aa4357ba1a705cb5ad399eb3d8508e4c8fc10 Mon Sep 17 00:00:00 2001
From: asgdf <asgdf@users.noreply.github.com>
Date: Tue, 14 Mar 2017 20:45:46 +0100
Subject: [PATCH] Fix config file path in testclient (#882)

Also fix possible reference error when config failed to load
---
 js/client.js    | 2 +-
 testclient.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/client.js b/js/client.js
index 83520cb36..5531077fe 100644
--- a/js/client.js
+++ b/js/client.js
@@ -645,7 +645,7 @@
 		connect: function () {
 			if (this.down) return;
 
-			if (Config.server.banned || Config.bannedHosts.indexOf(Config.server.host) >= 0) {
+			if (Config.server.banned || (Config.bannedHosts && Config.bannedHosts.indexOf(Config.server.host) >= 0)) {
 				this.addPopupMessage("This server has been deleted for breaking US laws, impersonating PS global staff, or other major rulebreaking.");
 				return;
 			}
diff --git a/testclient.html b/testclient.html
index 322cf3573..485c531f1 100644
--- a/testclient.html
+++ b/testclient.html
@@ -85,7 +85,7 @@
 			document.getElementById('loading-message').innerHTML += ' DONE<br />Loading data...';
 		</script>
 
-		<script src="https://play.pokemonshowdown.com/js/config.js"></script>
+		<script src="https://play.pokemonshowdown.com/config/config.js"></script>
 		<script src="js/battledata.js"></script>
 		<script src="data/pokedex-mini.js" onerror="loadRemoteData(this.src)"></script>
 		<script src="data/typechart.js" onerror="loadRemoteData(this.src)"></script>