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

replace == "LORE" with .equals("LORE")

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-04-28 11:58:55 -05:00
parent 753c3686ea
commit 10db850de4
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/City.java
+7 -7
View File
@@ -322,7 +322,7 @@ public class City extends AbstractWorldObject {
if (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) {
if (!BuildingManager.IsPlayerHostile(city.getTOL(), pc)) {
if (ConfigManager.MB_RULESET.getValue() == "LORE") {
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (city.getGuild().getGuildType().equals(pc.guild.getGuildType())) {
cities.add(city);
}
@@ -343,20 +343,20 @@ public class City extends AbstractWorldObject {
if (city.isNpc == 1)
if (city.isNoobIsle == 1) {
if (pc.getLevel() < 21)
if (ConfigManager.MB_RULESET.getValue() == "LORE" && city.getGuild().getGuildType().canJoin(pc)) {
if (ConfigManager.MB_RULESET.getValue().equals("LORE") && city.getGuild().getGuildType().canJoin(pc)) {
cities.add(city);
} else {
cities.add(city); //verify nation or guild is same
}
} else if (pc.getLevel() > 9)
if (ConfigManager.MB_RULESET.getValue() == "LORE" && city.getGuild().getGuildType().canJoin(pc)) {
if (ConfigManager.MB_RULESET.getValue().equals("LORE") && city.getGuild().getGuildType().canJoin(pc)) {
cities.add(city);
} else {
cities.add(city); //verify nation or guild is same
}
} else if (pc.getLevel() >= g.getTeleportMin() && pc.getLevel() <= g.getTeleportMax())
if (ConfigManager.MB_RULESET.getValue() == "LORE") {
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (city.getGuild().getGuildType().equals(pc.guild.getGuildType())) {
cities.add(city);
}
@@ -415,13 +415,13 @@ public class City extends AbstractWorldObject {
if (city.isNpc == 1)
if (city.isNoobIsle == 1) {
if (playerCharacter.getLevel() < 21)
if (ConfigManager.MB_RULESET.getValue() == "LORE" && city.getGuild().getGuildType().canJoin(playerCharacter)) {
if (ConfigManager.MB_RULESET.getValue().equals("LORE") && city.getGuild().getGuildType().canJoin(playerCharacter)) {
cities.add(city);
} else {
cities.add(city); //verify nation or guild is same
}
} else if (playerCharacter.getLevel() > 9)
if (ConfigManager.MB_RULESET.getValue() == "LORE") {
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) {
cities.add(city);
}
@@ -430,7 +430,7 @@ public class City extends AbstractWorldObject {
}
} else if (playerCharacter.getLevel() >= guild.getRepledgeMin() && playerCharacter.getLevel() <= guild.getRepledgeMax()) {
if (ConfigManager.MB_RULESET.getValue() == "LORE") {
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) {
cities.add(city);
}