diff --git a/2006Redone Client/src/ClientSettings.java b/2006Redone Client/src/ClientSettings.java index 2f144ab9..0d0e2889 100644 --- a/2006Redone Client/src/ClientSettings.java +++ b/2006Redone Client/src/ClientSettings.java @@ -22,8 +22,8 @@ public class ClientSettings { * on localhost * */ - public static String SERVER_IP = "35.226.247.68"; - //public final static String SERVER_IP = "127.0.0.1; + //public static String SERVER_IP = "35.226.247.68"; //NOW SET IN Main,java + public static String SERVER_IP = "127.0.0.1"; /** * The Npc Bits for the Server */ diff --git a/2006Redone Client/src/Main.java b/2006Redone Client/src/Main.java index 7f954aba..e7e2f768 100644 --- a/2006Redone Client/src/Main.java +++ b/2006Redone Client/src/Main.java @@ -16,6 +16,7 @@ public final class Main { */ public static void main(String[] args) { + ClientSettings.SERVER_IP = "35.226.247.68"; if (args.length > 1) { System.out.println("Running local"); diff --git a/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar b/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar index 7cfe9b26..89b0640b 100644 Binary files a/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar and b/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar differ diff --git a/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar b/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar index c79d67cd..8cad347a 100644 Binary files a/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar and b/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar differ diff --git a/CompiledServer/production/2006rebotted/ClientSettings.class b/CompiledServer/production/2006rebotted/ClientSettings.class index 31fdb1d5..0f9f4d98 100644 Binary files a/CompiledServer/production/2006rebotted/ClientSettings.class and b/CompiledServer/production/2006rebotted/ClientSettings.class differ diff --git a/CompiledServer/production/2006rebotted/META-INF/2006rebotted.kotlin_module b/CompiledServer/production/2006rebotted/META-INF/2006rebotted.kotlin_module new file mode 100644 index 00000000..2983af70 Binary files /dev/null and b/CompiledServer/production/2006rebotted/META-INF/2006rebotted.kotlin_module differ diff --git a/CompiledServer/production/2006rebotted/Main.class b/CompiledServer/production/2006rebotted/Main.class index af342052..28bd6a88 100644 Binary files a/CompiledServer/production/2006rebotted/Main.class and b/CompiledServer/production/2006rebotted/Main.class differ