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

Revert method refactor.

Browse Source
This commit is contained in:
MagicBot
2023-01-20 11:24:37 -05:00
parent 592caa40ea
commit 1c228df4a8
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/guild/GuildInfoMsg.java
+2 -2
View File
@@ -373,7 +373,7 @@ class GuildInfoMessageType5 extends GuildInfoMessageType {
if(pc != null && g != null && g.getObjectUUID() != 0) { if(pc != null && g != null && g.getObjectUUID() != 0) {
Guild n = g.getNation(); Guild n = g.getNation();
if(n == null) { if(n == null) {
n = Guild.getErrantGuild(); n = Guild.getErrantNation();
} }
writer.putInt(ago.getObjectType().ordinal()); writer.putInt(ago.getObjectType().ordinal());
@@ -412,7 +412,7 @@ class GuildInfoMessageType5 extends GuildInfoMessageType {
writer.putInt(GuildStatusController.getTitle(pc.getGuildStatus())); //Title writer.putInt(GuildStatusController.getTitle(pc.getGuildStatus())); //Title
writer.putInt(g.getCharter()); writer.putInt(g.getCharter());
if(g.getNation().equals(Guild.getErrantGuild())) if(g.getNation().equals(Guild.getErrantNation()))
writer.putString("Errant"); writer.putString("Errant");
else else
writer.putString("City"); writer.putString("City");
src/engine/objects/Guild.java
+14 -6
View File
@@ -81,6 +81,9 @@ public class Guild extends AbstractWorldObject {
private String hash; private String hash;
private boolean ownerIsNPC; private boolean ownerIsNPC;
private static Guild errantGuild;
private static Guild errantNation;
public LocalDateTime lastWooEditTime; public LocalDateTime lastWooEditTime;
public HashMap<Integer,GuildAlliances> guildAlliances = new HashMap<>(); public HashMap<Integer,GuildAlliances> guildAlliances = new HashMap<>();
@@ -407,7 +410,7 @@ public class Guild extends AbstractWorldObject {
*/ */
public boolean isErrant() { public boolean isErrant() {
return this.getObjectUUID() == Guild.errant.getObjectUUID(); return this.getObjectUUID() == Guild.errantGuild.getObjectUUID();
} }
@@ -721,14 +724,19 @@ Guild.serializeForClientMsg(guild,writer, null, false);
} }
private static Guild errant;
public static Guild getErrantGuild() { public static Guild getErrantGuild() {
if (Guild.errant == null) if (Guild.errantGuild == null)
Guild.errant = new Guild("None", null, 10, "Despot Rule", GuildTag.ERRANT, 0); Guild.errantGuild = new Guild( "None", Guild.getErrantNation(), 0,
"Anarchy", GuildTag.ERRANT, 0);
return Guild.errant; return Guild.errantGuild;
}
public static Guild getErrantNation() {
if (Guild.errantNation == null)
Guild.errantNation = new Guild("None", null, 10, "Despot Rule", GuildTag.ERRANT, 0);
return Guild.errantNation;
} }
public static Guild getGuild(final int objectUUID) { public static Guild getGuild(final int objectUUID) {