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

Inlines method. upgraded protection

Browse Source
This commit is contained in:
MagicBot
2026-05-10 10:36:27 -04:00
parent d014aafe45
commit 09c9dfbc06
15 changed files with 36 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Building.java
+4 -4
View File
@@ -602,10 +602,10 @@ public class Building extends AbstractWorldObject {
this.isDeranking.compareAndSet(false, true);
if ((bane.getOwner().getGuild().getGuildState() == GuildState.Sovereign) ||
(bane.getOwner().getGuild().getGuildState() == GuildState.Protectorate) ||
(bane.getOwner().getGuild().getGuildState() == GuildState.Province) ||
(bane.getOwner().getGuild().getGuildState() == GuildState.Nation))
if ((bane.getOwner().getGuild().guildState == GuildState.Sovereign) ||
(bane.getOwner().getGuild().guildState == GuildState.Protectorate) ||
(bane.getOwner().getGuild().guildState == GuildState.Province) ||
(bane.getOwner().getGuild().guildState == GuildState.Nation))
siegeResult = SiegeResult.DESTROY;
else
siegeResult = SiegeResult.CAPTURE;
src/engine/objects/City.java
+3 -3
View File
@@ -813,10 +813,10 @@ public class City extends AbstractWorldObject {
// Determine if this city is a nation capitol
if (this.getGuild().getGuildState() == GuildState.Nation)
if (this.getGuild().guildState == GuildState.Nation)
for (Guild sub : this.getGuild().getSubGuildList()) {
if ((sub.getGuildState() == GuildState.Protectorate) || (sub.getGuildState() == GuildState.Province)) {
if ((sub.guildState == GuildState.Protectorate) || (sub.guildState == GuildState.Province)) {
this.isCapital = 1;
break;
}
@@ -1186,7 +1186,7 @@ public class City extends AbstractWorldObject {
sourceGuild.setCityUUID(this.getObjectUUID());
sourceGuild.setNation(sourceGuild);
sourceGuild.setGuildState(GuildState.Sovereign);
sourceGuild.guildState = GuildState.Sovereign;
GuildManager.updateAllGuildTags(sourceGuild);
GuildManager.updateAllGuildBinds(sourceGuild, this);
src/engine/objects/Guild.java
+1 -9
View File
@@ -63,7 +63,7 @@ public class Guild extends AbstractWorldObject {
private ArrayList<Guild> recommendList = new ArrayList<>();
private ArrayList<Guild> subGuildList;
private int nationUUID = 0;
private GuildState guildState = GuildState.Errant;
public GuildState guildState = GuildState.Errant;
private String hash;
private boolean ownerIsNPC;
@@ -901,14 +901,6 @@ public class Guild extends AbstractWorldObject {
return motto;
}
public GuildState getGuildState() {
return guildState;
}
public void setGuildState(GuildState guildState) {
this.guildState = guildState;
}
/**
* @return the realmsOwned
*/