Fix #14

xmamo · Apr 23, 2016 · ee897a2 · ee897a2
1 parent 856158e
commit ee897a2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@ this program.  If not, see <http://www.gnu.org/licenses/>.
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>co.virtualdragon</groupId>
 	<artifactId>VanillaVotifier</artifactId>
-	<version>3.3.2</version>
+	<version>3.3.3</version>
 	<name>VanillaVotifier</name>
 	<packaging>jar</packaging>
 	<dependencies>

diff --git a/src/main/java/co/virtualdragon/vanillaVotifier/impl/JsonConfig.java b/src/main/java/co/virtualdragon/vanillaVotifier/impl/JsonConfig.java
@@ -264,7 +264,7 @@ public synchronized void save() throws IOException {
 		JSONObject config = new JSONObject();
 		config.put("config-version", getConfigVersion());
 		config.put("log-file", getLogFile().getPath());
-		config.put("ip", getInetSocketAddress().getHostString());
+		config.put("ip", getInetSocketAddress().getAddress().toString());
 		config.put("port", getInetSocketAddress().getPort());
 		config.put("key-pair-files", new JSONObject() {
 			{
@@ -277,7 +277,7 @@ public synchronized void save() throws IOException {
 				for (final RconConfig rconConfig : rconConfigs) {
 					put(new JSONObject() {
 						{
-							put("ip", rconConfig.getInetSocketAddress().getHostString());
+							put("ip", rconConfig.getInetSocketAddress().getAddress().toString());
 							put("port", rconConfig.getInetSocketAddress().getPort());
 							put("password", rconConfig.getPassword());
 							put("commands", rconConfig.getCommands());

diff --git a/src/main/java/co/virtualdragon/vanillaVotifier/impl/VanillaVotifierServerListener.java b/src/main/java/co/virtualdragon/vanillaVotifier/impl/VanillaVotifierServerListener.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2015 Matteo Morena
  *
  * This program is free software: you can redistribute it and/or modify it under
@@ -19,7 +19,6 @@
 import co.virtualdragon.vanillaVotifier.Listener;
 import co.virtualdragon.vanillaVotifier.Votifier;
 import co.virtualdragon.vanillaVotifier.event.Event;
-import co.virtualdragon.vanillaVotifier.event.server.RconCommandResponseEvent;
 import co.virtualdragon.vanillaVotifier.event.server.ComunicationExceptionEvent;
 import co.virtualdragon.vanillaVotifier.event.server.ConnectionCloseExceptionEvent;
 import co.virtualdragon.vanillaVotifier.event.server.ConnectionClosedEvent;
@@ -28,6 +27,7 @@
 import co.virtualdragon.vanillaVotifier.event.server.ConnectionInputStreamCloseExceptionEvent;
 import co.virtualdragon.vanillaVotifier.event.server.DecryptInputExceptionEvent;
 import co.virtualdragon.vanillaVotifier.event.server.InvalidRequestEvent;
+import co.virtualdragon.vanillaVotifier.event.server.RconCommandResponseEvent;
 import co.virtualdragon.vanillaVotifier.event.server.RconExceptionEvent;
 import co.virtualdragon.vanillaVotifier.event.server.SendingRconCommandEvent;
 import co.virtualdragon.vanillaVotifier.event.server.ServerAwaitingTaskCompletionEvent;
@@ -65,7 +65,7 @@ public void onEvent(Event event, Votifier votifier) {
 		} else if (event instanceof SendingRconCommandEvent) {
 			SendingRconCommandEvent sendingRconCommandEvent = (SendingRconCommandEvent) event;
 			votifier.getLogger().printlnTranslation("s5",
-					new SimpleEntry<String, Object>("ip", sendingRconCommandEvent.getRcon().getRconConfig().getInetSocketAddress().getHostString()),
+					new SimpleEntry<String, Object>("ip", sendingRconCommandEvent.getRcon().getRconConfig().getInetSocketAddress().getAddress().toString()),
 					new SimpleEntry<String, Object>("port", sendingRconCommandEvent.getRcon().getRconConfig().getInetSocketAddress().getPort()),
 					new SimpleEntry<String, Object>("command", sendingRconCommandEvent.getCommand()));
 		} else if (event instanceof RconCommandResponseEvent) {