From 7534b1d992a9fd9731b7cb940871d3200169409b Mon Sep 17 00:00:00 2001
From: Cola <vaultslave@gmail.com>
Date: Sun, 4 Jul 2021 03:08:17 +0100
Subject: [PATCH 1/3] Update zeus

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f3dd8bd..52f1b04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>com.github.maxopoly</groupId>
 	<artifactId>zeus</artifactId>
 	<name>Zeus</name>
-	<version>1.1</version>
+	<version>1.2</version>
 
 	<properties>
 		<java.compile.version>11</java.compile.version>
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>com.github.civclassic</groupId>
 		<artifactId>civclassic-parent</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<build>

From 9132aba63d822a60c64753d7d60b6161709b686a Mon Sep 17 00:00:00 2001
From: Cola <vaultslave@gmail.com>
Date: Thu, 18 Nov 2021 03:18:01 +0000
Subject: [PATCH 2/3] get ID instead of just object

---
 .../zeus/rabbit/incoming/artemis/PlayerInitTransferRequest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/maxopoly/zeus/rabbit/incoming/artemis/PlayerInitTransferRequest.java b/src/main/java/com/github/maxopoly/zeus/rabbit/incoming/artemis/PlayerInitTransferRequest.java
index 31ee647..54e384a 100644
--- a/src/main/java/com/github/maxopoly/zeus/rabbit/incoming/artemis/PlayerInitTransferRequest.java
+++ b/src/main/java/com/github/maxopoly/zeus/rabbit/incoming/artemis/PlayerInitTransferRequest.java
@@ -54,7 +54,7 @@ public boolean handleRequest(PlayerTransferSession connState, ConnectedServer se
 		if (targetServer == null) {
 			sendReply(sendingServer,
 					new RejectPlayerTransfer(connState.getTransactionID(), TransferRejectionReason.NO_TARGET_FOUND));
-			getLogger().error("Failed to find target server for " + connState.getLocation() + " from " + sendingServer);
+			getLogger().error("Failed to find target server for " + connState.getLocation() + " from " + sendingServer.getID());
 			return false;
 		}
 		connState.setTargetServer(targetServer);

From 5c2ed2fc4f50a59ce590a29cd394f8ef8f961183 Mon Sep 17 00:00:00 2001
From: Cola <vaultslave@gmail.com>
Date: Thu, 2 Dec 2021 15:03:56 +0000
Subject: [PATCH 3/3] Relocate JSON & Java 16

---
 pom.xml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52f1b04..c154949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	<version>1.2</version>
 
 	<properties>
-		<java.compile.version>11</java.compile.version>
+		<java.compile.version>16</java.compile.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
@@ -45,6 +45,24 @@
 					<compilerArgument>-proc:none</compilerArgument>
 				</configuration>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.3.0-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.json</pattern>
+                                    <shadedPattern>com.github.maxopoly.zeus.util.json</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 		</plugins>
 	</build>
 
@@ -53,7 +71,7 @@
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20160810</version>
+			<version>20210307</version>
 		</dependency>
 		<dependency>
 			<groupId>com.rabbitmq</groupId>