.

EarthMC-Toolkit · Jun 25, 2024 · 035102b · 035102b
1 parent eb63709
commit 035102b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bot/types.ts b/bot/types.ts
@@ -7,7 +7,7 @@ import type {
     SharedNameAndDescription
 } from "discord.js"
 
-import type { Dynmap, Squaremap } from "earthmc"
+import type { Map } from "earthmc"
 import type { Timestamp, WriteResult } from "firebase-admin/firestore"
 
 export type BaseCommand = {
@@ -43,7 +43,7 @@ export type DJSEvent = {
 }
 
 export type MapInstance = { 
-    emc: Squaremap | Dynmap,
+    emc: Map,
     db: MapDB
 }
 

diff --git a/common/resident.ts b/common/resident.ts
@@ -73,14 +73,14 @@ class ResidentHelper extends BaseHelper {
         if (!this.isNova) {
             let res: OAPIResident
             try {
-                res = await OfficialAPI.V2.resident(arg1)
+                res = await OfficialAPI.resident(arg1)
             } catch (e) {
                 console.log(e)
                 return false
             }
 
             if (res.town) {
-                const resTown = await OfficialAPI.V2.town(res.town.toLowerCase())
+                const resTown = await OfficialAPI.town(res.town.toLowerCase())
 
                 let rank = resTown.mayor == res.name ? "Mayor" : "Resident"
                 if (rank == "Mayor" && resTown.status.isCapital)