From 4a7013de61b6a8c025cf583eb3f4fde5da86bb45 Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Wed, 19 Jun 2024 16:56:06 -0400
Subject: [PATCH] Signature update

---
 src/engine/net/client/handlers/MerchantMsgHandler.java | 2 +-
 src/engine/net/client/msg/TeleportRepledgeListMsg.java | 2 +-
 src/engine/objects/City.java                           | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/engine/net/client/handlers/MerchantMsgHandler.java b/src/engine/net/client/handlers/MerchantMsgHandler.java
index 8ee903ee..a4ada8b6 100644
--- a/src/engine/net/client/handlers/MerchantMsgHandler.java
+++ b/src/engine/net/client/handlers/MerchantMsgHandler.java
@@ -248,7 +248,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
         City targetCity = null;
 
         if (isTeleport)
-            cities = City.getCitiesToTeleportTo(player);
+            cities = City.getCitiesToTeleportTo(player, false);
         else
             cities = City.getCitiesToRepledgeTo(player);
         for (City city : cities) {
diff --git a/src/engine/net/client/msg/TeleportRepledgeListMsg.java b/src/engine/net/client/msg/TeleportRepledgeListMsg.java
index d48fc751..897b9c6b 100644
--- a/src/engine/net/client/msg/TeleportRepledgeListMsg.java
+++ b/src/engine/net/client/msg/TeleportRepledgeListMsg.java
@@ -74,7 +74,7 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
     public void configure() {
 
         if (isTeleport)
-            cities = City.getCitiesToTeleportTo(player);
+            cities = City.getCitiesToTeleportTo(player, false);
         else
             cities = City.getCitiesToRepledgeTo(player);
     }
diff --git a/src/engine/objects/City.java b/src/engine/objects/City.java
index 59406707..be7a88b3 100644
--- a/src/engine/objects/City.java
+++ b/src/engine/objects/City.java
@@ -286,7 +286,7 @@ public class City extends AbstractWorldObject {
         return city.getBindLoc();
     }
 
-    public static ArrayList<City> getCitiesToTeleportTo(PlayerCharacter playerCharacter) {
+    public static ArrayList<City> getCitiesToTeleportTo(PlayerCharacter playerCharacter, boolean repledge) {
 
         ArrayList<City> cities = new ArrayList<>();
 
@@ -307,7 +307,6 @@ public class City extends AbstractWorldObject {
 
                 if (city.parentZone == null)
                     continue;
-                ;
 
                 if (city.parentZone.guild_zone && city.isOpen() && city.getTOL().rank > 4 && city.getGuild().charter.equals(playerCharacter.guild.charter)) {