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

cannot teleport od repledge to perdition or bastion

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-05-14 19:35:37 -05:00
parent 1f8c5495ab
commit 5a25958aa5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/City.java
+4
View File
@@ -300,6 +300,8 @@ public class City extends AbstractWorldObject {
//handle compiling of cities able to be teleported to for lore rule-set //handle compiling of cities able to be teleported to for lore rule-set
for (AbstractGameObject ago : worldCities.values()) { for (AbstractGameObject ago : worldCities.values()) {
City city = (City) ago; City city = (City) ago;
if(city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
continue; // cannot teleport to perdition or bastion
if (city.isNpc == 1 && city.getGuild().charter.equals(pc.guild.charter)) { if (city.isNpc == 1 && city.getGuild().charter.equals(pc.guild.charter)) {
cities.add(city); // anyone of the same charter can teleport to a safehold of that charter cities.add(city); // anyone of the same charter can teleport to a safehold of that charter
continue; continue;
@@ -405,6 +407,8 @@ public class City extends AbstractWorldObject {
//handle compiling of cities able to be repledged to for lore rule-set //handle compiling of cities able to be repledged to for lore rule-set
for (AbstractGameObject ago : worldCities.values()) { for (AbstractGameObject ago : worldCities.values()) {
City city = (City) ago; City city = (City) ago;
if(city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
continue; // cannot repledge to perdition or bastion
if (city.isNpc == 1 && city.getGuild().charter.canJoin(playerCharacter)) { if (city.isNpc == 1 && city.getGuild().charter.canJoin(playerCharacter)) {
cities.add(city); // anyone of the same charter can teleport to a safehold of that charter cities.add(city); // anyone of the same charter can teleport to a safehold of that charter
continue; continue;