Skip to content

Commit

Permalink
status/cb
Browse files Browse the repository at this point in the history
  • Loading branch information
xdnw committed May 17, 2024
1 parent 2c3c4fd commit e8106b9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/main/java/link/locutus/discord/db/conflict/Conflict.java
Original file line number Diff line number Diff line change
Expand Up @@ -798,10 +798,10 @@ public boolean isDirty() {
}

public void set(Conflict wikiConflict, boolean setName) {
if (getStatusDesc().isEmpty()) {
if (!wikiConflict.getStatusDesc().equalsIgnoreCase(getStatusDesc())) {
setStatus(wikiConflict.getStatusDesc());
}
if (getCasusBelli().isEmpty()) {
if (!wikiConflict.getCasusBelli().equalsIgnoreCase(getCasusBelli())) {
setCasusBelli(wikiConflict.getCasusBelli());
}
if (setName && !wikiConflict.getName().equalsIgnoreCase(getName())) {
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/link/locutus/wiki/pages/WikiWarRoomPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ public String generateMarkdown() {
"# Creating a sheet of war rooms",
CM.war.counter.sheet.cmd.create(null, null, null, null, "True", null).toString(),
commandMarkdownSpoiler(CM.war.counter.sheet.cmd),
"# Force update war rooms",
commandMarkdownSpoiler(CM.admin.sync.warrooms.cmd)
"# Force update/delete war rooms",
commandMarkdownSpoiler(CM.admin.sync.warrooms.cmd),
commandMarkdownSpoiler(CM.war.room.delete_planning.cmd),
commandMarkdownSpoiler(CM.war.room.delete_for_enemies.cmd)
);
}
}

0 comments on commit e8106b9

Please sign in to comment.