v1.8.6future

1 files changed, 25 insertions, 4 deletions

diff --git a/chat/grieferTrack.js b/chat/grieferTrack.js
index 2b745c3..157696b 100644
--- a/chat/grieferTrack.js
+++ b/chat/grieferTrack.js
@@ -1,6 +1,7 @@
 import axios from "../../axios"
 import settings from "../settings"
 import constants from "../util/constants"
+import { checkInDwarven, checkInHollows } from "../util/helperFunctions"
 const PREFIX = constants.PREFIX
 let checkedPlayers = [],
  griefers = []
@@ -25,7 +26,7 @@ register("worldLoad", () => {
 
 function checkMMiners()
 {
-    if (!settings.trackGriefers) return
+    if (!settings.trackGriefers || (!settings.grieferEverywhere && !(checkInDwarven() || checkInHollows()))) return
     try
     {
         const NetHandlerPlayClient = Client.getConnection(),
@@ -36,9 +37,13 @@ function checkMMiners()
             
             if(!checkedPlayers.includes(player))
             {
-                if(griefers.includes(player))
-                    ChatLib.chat(`${PREFIX}&e'${player}' is a griefer!`)
-                checkedPlayers.push(player)
+                let griefer = findGriefer(player)
+
+                if(griefer.found)
+                {
+                    ChatLib.chat(`${PREFIX}&e'${player}' has griefed &e&l${griefer.offences} &etime(s). Their last grief was on ${griefer.dateObj.toString().slice(4, 15)}.`)
+                    checkedPlayers.push(player)
+                }
             }
         })
     } catch(err) { if(settings.debug) console.log("grieferTrack trycatch: " + err) }
@@ -59,4 +64,20 @@ register("gameLoad", () => {
 })
 
 
+export function findGriefer(player)
+{
+    let grieferReturnObj = {}
+    grieferReturnObj.found = false
+    griefers.forEach(griefer => {
+        griefer.dateObj = new Date(0)
+        griefer.dateObj.setUTCMilliseconds(griefer.timestamp)
+
+        if(griefer.name.toLowerCase() == player.toLowerCase())
+        {
+            grieferReturnObj = griefer
+            grieferReturnObj.found = true
+        }
+    })
+    return grieferReturnObj
+}
 export default ""
\ No newline at end of file