MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Signature update

Browse Source
This commit is contained in:
MagicBot
2024-06-19 16:56:06 -04:00
parent 56564f1c3b
commit 4a7013de61
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/MerchantMsgHandler.java
+1 -1
View File
@@ -248,7 +248,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
City targetCity = null; City targetCity = null;
if (isTeleport) if (isTeleport)
cities = City.getCitiesToTeleportTo(player); cities = City.getCitiesToTeleportTo(player, false);
else else
cities = City.getCitiesToRepledgeTo(player); cities = City.getCitiesToRepledgeTo(player);
for (City city : cities) { for (City city : cities) {
src/engine/net/client/msg/TeleportRepledgeListMsg.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
public void configure() { public void configure() {
if (isTeleport) if (isTeleport)
cities = City.getCitiesToTeleportTo(player); cities = City.getCitiesToTeleportTo(player, false);
else else
cities = City.getCitiesToRepledgeTo(player); cities = City.getCitiesToRepledgeTo(player);
} }
src/engine/objects/City.java
+1 -2
View File
@@ -286,7 +286,7 @@ public class City extends AbstractWorldObject {
return city.getBindLoc(); return city.getBindLoc();
} }
public static ArrayList<City> getCitiesToTeleportTo(PlayerCharacter playerCharacter) { public static ArrayList<City> getCitiesToTeleportTo(PlayerCharacter playerCharacter, boolean repledge) {
ArrayList<City> cities = new ArrayList<>(); ArrayList<City> cities = new ArrayList<>();
@@ -307,7 +307,6 @@ public class City extends AbstractWorldObject {
if (city.parentZone == null) if (city.parentZone == null)
continue; continue;
;
if (city.parentZone.guild_zone && city.isOpen() && city.getTOL().rank > 4 && city.getGuild().charter.equals(playerCharacter.guild.charter)) { if (city.parentZone.guild_zone && city.isOpen() && city.getTOL().rank > 4 && city.getGuild().charter.equals(playerCharacter.guild.charter)) {