Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Method cleanup.

Browse Source
This commit is contained in:
MagicBot
2024-06-24 03:18:59 -04:00
parent 533565e37e
commit e79da63556
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/City.java
+7 -6
View File
@@ -306,15 +306,16 @@ public class City extends AbstractWorldObject {
if (city.parentZone == null) if (city.parentZone == null)
continue; continue;
if(repledge && city.getGuild().equals(playerCharacter.guild)){
//can't repledge to a guild you're already part of //can't repledge to a guild you're already part of
if (repledge && city.getGuild().equals(playerCharacter.guild))
continue; continue;
}
if (city.parentZone.guild_zone) { if (city.parentZone.guild_zone) {
if(city.getGuild().getNation().equals(playerCharacter.guild.getNation())){
//players can all port and repledge inside their own nation //players can all port and repledge inside their own nation
if(city.getGuild().getNation().equals(playerCharacter.guild.getNation())){
cities.add(city); cities.add(city);
continue; continue;
} }
@@ -325,10 +326,10 @@ public class City extends AbstractWorldObject {
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (!repledge) if (repledge) {
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) if (!city.getGuild().charter.canJoin(playerCharacter))
continue; continue;
else if (!city.getGuild().charter.canJoin(playerCharacter)) } else if (!city.getGuild().charter.equals(playerCharacter.guild.charter))
continue; continue;
} }