Fix reconnecting behavior

Maxopoly · Nov 20, 2018 · b4e6937 · b4e6937
1 parent b3c734c
commit b4e6937
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.github.maxopoly</groupId>
 	<artifactId>angelia-cmd</artifactId>
-	<version>1.0.02</version>
+	<version>1.0.03</version>
 	<packaging>jar</packaging>
 
 	<name>Angelia-cmd</name>

diff --git a/src/main/java/com/github/maxopoly/angelia_cmd/CommandLineReader.java b/src/main/java/com/github/maxopoly/angelia_cmd/CommandLineReader.java
@@ -27,7 +27,10 @@ public CommandLineReader(Logger logger, ActiveConnectionManager connectionMan, S
 		this.connectionMan = connectionMan;
 		this.playerName = playerName;
 		this.mode = Mode.COMMAND;
-		getConnection().getLogger().info("--- Set console to command mode");
+		ServerConnection conn = getConnection();
+		if (conn != null) {
+			getConnection().getLogger().info("--- Set console to command mode");
+		}
 		this.cmdHandler = cmdHandler;
 	}
 
@@ -39,6 +42,9 @@ public void start() {
 		}
 		while (true) {
 			String msg = c.readLine("");
+			if (msg == null) {
+				continue;
+			}
 			if (msg.equals("++")) {
 				if (mode == Mode.CHAT) {
 					mode = Mode.COMMAND;

diff --git a/src/main/java/com/github/maxopoly/angelia_cmd/Main.java b/src/main/java/com/github/maxopoly/angelia_cmd/Main.java
@@ -21,7 +21,7 @@ public static void main(String[] args) {
 			System.exit(0);
 			return;
 		}
-		connManager.initConnection(connection, false, null);
+		connManager.initConnection(connection, null);
 		connection.getEventHandler().registerListener(new ChatListener(logger));
 		connection.getEventHandler().registerListener(new PlayerStateListener(logger));
 		cmdHandler = new CommandHandler(logger);

diff --git a/src/main/java/com/github/maxopoly/angelia_cmd/command_handling/CommandHandler.java b/src/main/java/com/github/maxopoly/angelia_cmd/command_handling/CommandHandler.java
@@ -73,6 +73,10 @@ public synchronized void handle(String input, ServerConnection connection) {
 		if (input == null || input.equals("")) {
 			return;
 		}
+		if (connection == null) {
+			System.out.println("Currently not connected to a server, could not process command");
+			return;
+		}
 		connection.getLogger().info("INPUT: " + input);
 		String[] args = input.split(" ");
 		if (args[0].toLowerCase().equals("help")) {

diff --git a/src/main/java/com/github/maxopoly/angelia_cmd/listener/ChatListener.java b/src/main/java/com/github/maxopoly/angelia_cmd/listener/ChatListener.java
@@ -13,7 +13,7 @@ public ChatListener(Logger logger) {
 		this.logger = logger;
 	}
 
-	@AngeliaEventHandler
+	@AngeliaEventHandler(autoTransfer = true)
 	public void chatMessageReceived(ChatMessageReceivedEvent e) {
 		logger.info("[CHAT] " + e.getMessage());
 	}

diff --git a/src/main/java/com/github/maxopoly/angelia_cmd/listener/PlayerStateListener.java b/src/main/java/com/github/maxopoly/angelia_cmd/listener/PlayerStateListener.java
@@ -16,7 +16,7 @@ public PlayerStateListener(Logger logger) {
 		this.formatter = new DecimalFormat("#.###");
 	}
 
-	@AngeliaEventHandler
+	@AngeliaEventHandler(autoTransfer = true)
 	public void chatMessageReceived(HealthChangeEvent e) {
 		if (e.getNewValue() == e.getOldValue()) {
 			return;