update to 1.2.6, support exit spectator mode.

ainilili · Mar 25, 2021 · 21d98aa · 21d98aa
1 parent 438b79c
commit 21d98aa
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/landlords-client/pom.xml b/landlords-client/pom.xml
@@ -13,14 +13,14 @@
 	<parent>
 		<groupId>com.smallnico.ratel</groupId>
 		<artifactId>landlords</artifactId>
-		<version>1.2.5</version>
+		<version>1.2.6</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.smallnico.ratel</groupId>
 			<artifactId>landlords-common</artifactId>
-			<version>1.2.5</version>
+			<version>1.2.6</version>
 		</dependency>
 	</dependencies>
 

diff --git a/...org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH_SUCCESSFUL.java b/...org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH_SUCCESSFUL.java
@@ -40,7 +40,7 @@ public void call(Channel channel, String data) {
     }
 
     private void registerExitEvent(Channel channel) {
-        String enter = SimpleWriter.write("watch");
+        String enter = SimpleWriter.write();
         if ("exit".equalsIgnoreCase(enter) || "e".equalsIgnoreCase(enter)) {
             quitWatch(channel);
             return;

diff --git a/landlords-common/pom.xml b/landlords-common/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.smallnico.ratel</groupId>
 		<artifactId>landlords</artifactId>
-		<version>1.2.5</version>
+		<version>1.2.6</version>
 	</parent>
 
 </project>
diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/print/SimpleWriter.java b/landlords-common/src/main/java/org/nico/ratel/landlords/print/SimpleWriter.java
@@ -11,12 +11,18 @@ public class SimpleWriter {
 	public static String write(String message) {
 		System.out.println();
 		System.out.print("[ratel@" + message + "]$ ");
+		try {
+			return write();
+		}finally {
+			System.out.println();
+		}
+	}
+
+	public static String write() {
 		try {
 			return reader.readLine();
 		} catch (IOException e) {
 			e.printStackTrace();
-		}finally {
-			System.out.println();
 		}
 		return null;
 	}

diff --git a/landlords-server/pom.xml b/landlords-server/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.smallnico.ratel</groupId>
 		<artifactId>landlords</artifactId>
-		<version>1.2.5</version>
+		<version>1.2.6</version>
 	</parent>
 
 	<properties>
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>com.smallnico.ratel</groupId>
 			<artifactId>landlords-common</artifactId>
-			<version>1.2.5</version>
+			<version>1.2.6</version>
 		</dependency>
 	</dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.smallnico.ratel</groupId>
 	<artifactId>landlords</artifactId>
-	<version>1.2.5</version>
+	<version>1.2.6</version>
 	<name>ratel</name>
 	<url>https://github.com/ainilili/ratel</url>
 	<packaging>pom</packaging>