From 9ecebc929db9c486bd0e9981e270449e2b9e38b5 Mon Sep 17 00:00:00 2001
From: destro174 <40720638+destro174@users.noreply.github.com>
Date: Sat, 26 Feb 2022 11:00:53 +0100
Subject: [PATCH] Some fixes and changes to IgnoreClaimWarningTask

---
 .../GriefPrevention/GriefPrevention.java             |  2 +-
 .../GriefPrevention/PlayerEventHandler.java          | 12 ++++++++++++
 .../alttd/tasks/IgnoreClaimWarningTask.java          |  5 ++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
index 2f993aa..f6877cd 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
@@ -238,7 +238,7 @@ public class GriefPrevention extends JavaPlugin
     private Pl3xMapHook pl3xmapHook;
     private DatabaseConnection databaseConnection;
 
-    private HashMap<UUID, IgnoreClaimWarningTask> ignoreClaimWarningTasks;
+    public HashMap<UUID, IgnoreClaimWarningTask> ignoreClaimWarningTasks;
 
     //adds a server log entry
     public static synchronized void AddLogEntry(String entry, CustomLogEntryTypes customLogType, boolean excludeFromServerLogs)
diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
index b988ad2..0ad439a 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
@@ -305,6 +305,13 @@ class PlayerEventHandler implements Listener
         Player player = event.getPlayer();
         PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId());
         playerData.wasKicked = true;
+
+        UUID playerID = player.getUniqueId();
+        if(instance.ignoreClaimWarningTasks.containsKey(playerID))
+        {
+            instance.ignoreClaimWarningTasks.get(playerID).cancel();
+            instance.ignoreClaimWarningTasks.remove(playerID);
+        }
     }
 
     //when a player quits...
@@ -357,6 +364,11 @@ class PlayerEventHandler implements Listener
                 event.setQuitMessage("");
             }
         }
+        if(instance.ignoreClaimWarningTasks.containsKey(playerID))
+        {
+            instance.ignoreClaimWarningTasks.get(playerID).cancel();
+            instance.ignoreClaimWarningTasks.remove(playerID);
+        }
     }
 
     //determines whether or not a login or logout notification should be silenced, depending on how many there have been in the last minute
diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/tasks/IgnoreClaimWarningTask.java b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/tasks/IgnoreClaimWarningTask.java
index 35f4866..7dbbfda 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/tasks/IgnoreClaimWarningTask.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/tasks/IgnoreClaimWarningTask.java
@@ -3,6 +3,7 @@ package me.ryanhamshire.GriefPrevention.alttd.tasks;
 import me.ryanhamshire.GriefPrevention.GriefPrevention;
 import me.ryanhamshire.GriefPrevention.alttd.config.Config;
 import me.ryanhamshire.GriefPrevention.alttd.util.Utils;
+import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
 import net.kyori.adventure.text.minimessage.template.TemplateResolver;
@@ -45,7 +46,9 @@ public class IgnoreClaimWarningTask extends BukkitRunnable
                 Template.template("player", player.name()),
                 Template.template("time", Utils.getPassedTime(time))
         ));
-        Bukkit.broadcast(MiniMessage.miniMessage().deserialize(Config.ignoreClaimWarningMessage, TemplateResolver.templates(templates)), Config.ignoreClaimWarningPermission);
+        Component component = MiniMessage.miniMessage().deserialize(Config.ignoreClaimWarningMessage, TemplateResolver.templates(templates));
+        Bukkit.broadcast(component, Config.ignoreClaimWarningPermission);
+        player.sendMessage(component);
         this.init();
     }
 }
\ No newline at end of file