Prevent two servers from trading with different versions

erikzimmermann · Jul 13, 2024 · 85786eb · 85786eb
1 parent 7da3e8a
commit 85786eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...stem-Spigot/src/main/java/de/codingair/tradesystem/spigot/trade/managers/RuleManager.java b/...stem-Spigot/src/main/java/de/codingair/tradesystem/spigot/trade/managers/RuleManager.java
@@ -152,10 +152,10 @@ public static void message(Player player, String other, TradeInvitePacket.Result
             case INCOMPATIBLE:
                 assert server != null;
                 TradeSystem.getInstance().getLogger().log(Level.WARNING,
-                        "\"" + player.getName() + "\" tried to trade with \"" + other + "\" on server \"" + server + "\" but the trade configurations/versions from both servers are incompatible.\n\n" +
+                        "\"" + player.getName() + "\" tried to trade with \"" + other + "\" on server \"" + server + "\" but the server versions, trade configurations or plugin versions from both servers are incompatible.\n\n" +
                                 "You have two options to solve this:\n" +
                                 "1. Use the group function in the trade-configuration file on your proxy to separate both servers from each other or\n" +
-                                "2. Copy the Config.yml from one server to the other server"
+                                "2. Copy the Config.yml from one server to the other server and make sure both server/plugin versions are the same."
                 );
                 Lang.send(player, "Trade_Partner_is_Offline");
                 break;

diff --git a/...ystem-Spigot/src/main/java/de/codingair/tradesystem/spigot/transfer/ProxyDataHandler.java b/...ystem-Spigot/src/main/java/de/codingair/tradesystem/spigot/transfer/ProxyDataHandler.java
@@ -1,5 +1,6 @@
 package de.codingair.tradesystem.spigot.transfer;
 
+import de.codingair.codingapi.server.specification.Version;
 import de.codingair.tradesystem.spigot.TradeSystem;
 import de.codingair.tradesystem.spigot.extras.blacklist.BlockedItem;
 import de.codingair.tradesystem.spigot.trade.ProxyTrade;
@@ -92,6 +93,7 @@ public int getTradeHash() {
         }
 
         return Objects.hash(
+                Version.get(),                                              // fix: java.lang.IllegalArgumentException: Newer version! Server downgrades are not supported!
                 patternHash,
                 cooldown,
                 TradeSystem.handler().isRevokeReadyOnChange(),