From e8106b92041246430465f0583d5f465fd2c5777d Mon Sep 17 00:00:00 2001 From: test Date: Fri, 17 May 2024 11:50:17 +1000 Subject: [PATCH] status/cb --- .../java/link/locutus/discord/db/conflict/Conflict.java | 4 ++-- src/main/java/link/locutus/wiki/pages/WikiWarRoomPage.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/link/locutus/discord/db/conflict/Conflict.java b/src/main/java/link/locutus/discord/db/conflict/Conflict.java index 42127606..d5381026 100644 --- a/src/main/java/link/locutus/discord/db/conflict/Conflict.java +++ b/src/main/java/link/locutus/discord/db/conflict/Conflict.java @@ -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())) { diff --git a/src/main/java/link/locutus/wiki/pages/WikiWarRoomPage.java b/src/main/java/link/locutus/wiki/pages/WikiWarRoomPage.java index 09f2df9f..e0bbb1ba 100644 --- a/src/main/java/link/locutus/wiki/pages/WikiWarRoomPage.java +++ b/src/main/java/link/locutus/wiki/pages/WikiWarRoomPage.java @@ -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) ); } }