From c817674c51cee652679fbfa972629c6c555f8161 Mon Sep 17 00:00:00 2001
From: O3H <owen77stubbs@gmail.com>
Date: Mon, 8 Jul 2024 16:41:55 +0100
Subject: [PATCH] bring back town flags

---
 aurora/commands/town.ts      |  16 +++++++++-------
 aurora/slashcommands/town.ts |   9 +++++----
 bun.lockb                    | Bin 160744 -> 160744 bytes
 package.json                 |   3 ++-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/aurora/commands/town.ts b/aurora/commands/town.ts
index 4633c7c0..e48bbd19 100644
--- a/aurora/commands/town.ts
+++ b/aurora/commands/town.ts
@@ -240,7 +240,8 @@ export default {
         if (!town) return m.edit({embeds: [new EmbedBuilder()
             .setTitle("Invalid town name!")
             .setDescription(opt + " doesn't seem to be a valid town name, please try again.")
-            .setTimestamp().setColor(Colors.Red)
+            .setColor(Colors.Red)
+            .setTimestamp()
         ]}).then(m => setTimeout(() => m.delete(), 10000)).catch(() => {})
 
         towns = defaultSort(towns)
@@ -335,7 +336,7 @@ export default {
                     ))    
                 }  
                 else townEmbed.addFields(embedField("Residents", townResidentsLength.toString()))
-            } 
+            }
             else townEmbed.addFields(embedField("Residents", "There are no residents in this town?"))
 
             const townCouncillorsLen = town.councillors.length
@@ -373,13 +374,14 @@ export default {
             // }
         }
 
-        // const [green, red] = ["<:green_tick:1036290473708495028>", "<:red_tick:1036290475012915270>"]
-        // townEmbed.addFields(embedField("Flags", `
-        //     ${town.flags.pvp ? green : red } PVP
-        // `))
+        const [green, red] = ["<:green_tick:1036290473708495028>", "<:red_tick:1036290475012915270>"]
+        townEmbed.addFields(embedField("Flags", `
+            ${town.flags.pvp ? green : red } PVP
+            ${town.flags.public ? green : red } Public
+        `))
 
         // ${town.mobs ? green : red } Mobs 
-        // ${town.public? green : red } Public
+        // ${town.public ? green : red } Public
         // ${town.explosion ? green : red } Explosions 
         // ${town.fire ? green : red } Fire Spread
 
diff --git a/aurora/slashcommands/town.ts b/aurora/slashcommands/town.ts
index 1796d6a8..b47d4916 100644
--- a/aurora/slashcommands/town.ts
+++ b/aurora/slashcommands/town.ts
@@ -319,10 +319,11 @@ export default {
                 // //#endregion
             }
 
-            // const [green, red] = ["<:green_tick:1036290473708495028>", "<:red_tick:1036290475012915270>"]
-            // townEmbed.addFields(embedField("Flags", `
-            //     ${town.flags.pvp ? green : red } PVP
-            // `))
+            const [green, red] = ["<:green_tick:1036290473708495028>", "<:red_tick:1036290475012915270>"]
+            townEmbed.addFields(embedField("Flags", `
+                ${town.flags.pvp ? green : red } PVP
+                ${town.flags.public ? green : red } Public
+            `))
 
             // ${town.flags.mobs ? green : red } Mobs 
             // ${town.flags.public ? green : red } Public
diff --git a/bun.lockb b/bun.lockb
index 9c7a54e13ba25dad9a230d88e7edc0226fa6b7f0..48560730d7aabc64b6cf9c25e55e7e8e65ffbda9 100644
GIT binary patch
delta 140
zcmV;70CWH7=LzWN36L%zrznqHyjX%x@3Bkq(y|>G52#1^9<w!-y)x9UwuWtVu}<bv
zlQbkWvuIN#lt4?_5huuXr@@4Fltw8(Zgk%ct81ZEjy8&2t=6HAi`1~si3@$gS_yO8
uL{@hl1$PWxpZ){NN}8BIq4=ocEON8W=Oe-aH@ESr0YjAmH@7uE0<$!`L_%o*

delta 140
zcmV;70CWH7=LzWN36L%z;^DV5XoM3qVikb4xQHa>HMvRJrCKE)B+3mo@DQ-yu}<bv
zle8=}vuIN#lt7!%d4$OhqYnTTe2}5Z+4p=J@yCC_#3)<<x>r+W4;q0<U3YIW_<6C-
uuS7B<7@2;cI6}^|ssqa$$tDs+)pfJY=Oe-aHn;Jq0YjAmHn%lD0<$zVvp_2V

diff --git a/package.json b/package.json
index 2d3dc913..935d60bb 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "reinstall": "rimraf node_modules && bun install",
     "start-js": "bun run compile && node ./dist/index.js",
     "start": "tsx index.ts",
+    "stop": "pm2 stop EMCS",
     "reload": "pm2 startOrGracefulReload --attach ecosystem.json",
     "restart": "bun run reinstall && pm2 startOrRestart ecosystem.json",
     "deploy": "pm2 deploy production"
@@ -18,7 +19,7 @@
     "@isaacs/ttlcache": "^1.4.1",
     "discord.js": "14.13.0",
     "dotenv": "^16.4.5",
-    "earthmc": "9.6.0",
+    "earthmc": "9.7.0",
     "firebase": "10.12.3",
     "firebase-admin": "12.2.0",
     "moment": "^2.29.4",