MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 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/gameManager/PowersManager.java
+1 -1
View File
@@ -173,7 +173,7 @@ public enum PowersManager {
public static void usePower(final PerformActionMsg msg, ClientConnection origin, public static void usePower(final PerformActionMsg msg, ClientConnection origin,
boolean sendCastToSelf) { boolean sendCastToSelf) {
if (ConfigManager.MB_RULESET.getValue() == "LORE") { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
PowersBase pb = PowersManager.powersBaseByToken.get(msg.getPowerUsedID()); PowersBase pb = PowersManager.powersBaseByToken.get(msg.getPowerUsedID());
PlayerCharacter caster = origin.getPlayerCharacter(); PlayerCharacter caster = origin.getPlayerCharacter();
PlayerCharacter target = PlayerCharacter.getFromCache(msg.getTargetID()); PlayerCharacter target = PlayerCharacter.getFromCache(msg.getTargetID());
src/engine/net/client/handlers/GroupInviteHandler.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class GroupInviteHandler extends AbstractClientMsgHandler {
if (target.isIgnoringPlayer(source)) if (target.isIgnoringPlayer(source))
return false; return false;
if (ConfigManager.MB_RULESET.getValue() == "LORE") { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (source.guild.equals(Guild.getErrantGuild())) if (source.guild.equals(Guild.getErrantGuild()))
return false; return false;
src/engine/net/client/handlers/InviteToGuildHandler.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class InviteToGuildHandler extends AbstractClientMsgHandler {
ErrorPopupMsg.sendErrorPopup(sourcePlayer, 135);// you do not meet the level required for this SWORN guild ErrorPopupMsg.sendErrorPopup(sourcePlayer, 135);// you do not meet the level required for this SWORN guild
return true; return true;
} }
if (ConfigManager.MB_RULESET.getValue() == "LORE") { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (GuildManager.meetsLoreRequirements(sourcePlayer.guild, targetPlayer) == false) { if (GuildManager.meetsLoreRequirements(sourcePlayer.guild, targetPlayer) == false) {
ChatManager.chatGuildError(sourcePlayer, targetPlayer.getFirstName() + " does not meet charter requirements!"); ChatManager.chatGuildError(sourcePlayer, targetPlayer.getFirstName() + " does not meet charter requirements!");
return true; return true;
src/engine/net/client/handlers/InviteToSubHandler.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
sendChat(source, "This Guild can't be subbed."); sendChat(source, "This Guild can't be subbed.");
return true; return true;
} }
if (ConfigManager.MB_RULESET.getValue() == "LORE") { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (source.guild.getGuildType().equals(target.guild.getGuildType()) == false) { if (source.guild.getGuildType().equals(target.guild.getGuildType()) == false) {
sendChat(source, "You Must Be The Same Charter To Form A Nation."); sendChat(source, "You Must Be The Same Charter To Form A Nation.");
return true; return true;
src/engine/net/client/handlers/LeaveGuildHandler.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class LeaveGuildHandler extends AbstractClientMsgHandler {
ChatManager.chatGuildInfo(oldGuild, playerCharacter.getFirstName() + " has left the guild."); ChatManager.chatGuildInfo(oldGuild, playerCharacter.getFirstName() + " has left the guild.");
oldGuild.removePlayer(playerCharacter, GuildHistoryType.LEAVE); oldGuild.removePlayer(playerCharacter, GuildHistoryType.LEAVE);
if (ConfigManager.MB_RULESET.getValue() == "LORE") { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (GroupManager.getGroup(playerCharacter) != null) if (GroupManager.getGroup(playerCharacter) != null)
GroupManager.getGroup(playerCharacter).removeGroupMember(playerCharacter); GroupManager.getGroup(playerCharacter).removeGroupMember(playerCharacter);
} }
src/engine/net/client/handlers/SendSummonsMsgHandler.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class SendSummonsMsgHandler extends AbstractClientMsgHandler {
return true; return true;
} }
if (ConfigManager.MB_RULESET.getValue() == "LORE") { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (playerCharacter.guild.getGuildType().equals(target.guild.getGuildType()) == false) { if (playerCharacter.guild.getGuildType().equals(target.guild.getGuildType()) == false) {
ChatManager.chatInfoError(playerCharacter, ChatManager.chatInfoError(playerCharacter,
"Cannot summon player outside your charter."); "Cannot summon player outside your charter.");
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 (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) {
if (!BuildingManager.IsPlayerHostile(city.getTOL(), pc)) { 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())) { if (city.getGuild().getGuildType().equals(pc.guild.getGuildType())) {
cities.add(city); cities.add(city);
} }
@@ -343,20 +343,20 @@ public class City extends AbstractWorldObject {
if (city.isNpc == 1) if (city.isNpc == 1)
if (city.isNoobIsle == 1) { if (city.isNoobIsle == 1) {
if (pc.getLevel() < 21) 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); cities.add(city);
} else { } else {
cities.add(city); //verify nation or guild is same cities.add(city); //verify nation or guild is same
} }
} else if (pc.getLevel() > 9) } 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); cities.add(city);
} else { } else {
cities.add(city); //verify nation or guild is same cities.add(city); //verify nation or guild is same
} }
} else if (pc.getLevel() >= g.getTeleportMin() && pc.getLevel() <= g.getTeleportMax()) } 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())) { if (city.getGuild().getGuildType().equals(pc.guild.getGuildType())) {
cities.add(city); cities.add(city);
} }
@@ -415,13 +415,13 @@ public class City extends AbstractWorldObject {
if (city.isNpc == 1) if (city.isNpc == 1)
if (city.isNoobIsle == 1) { if (city.isNoobIsle == 1) {
if (playerCharacter.getLevel() < 21) 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); cities.add(city);
} else { } else {
cities.add(city); //verify nation or guild is same cities.add(city); //verify nation or guild is same
} }
} else if (playerCharacter.getLevel() > 9) } 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())) { if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) {
cities.add(city); cities.add(city);
} }
@@ -430,7 +430,7 @@ public class City extends AbstractWorldObject {
} }
} else if (playerCharacter.getLevel() >= guild.getRepledgeMin() && playerCharacter.getLevel() <= guild.getRepledgeMax()) { } 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())) { if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) {
cities.add(city); cities.add(city);
} }