Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes and changes to IgnoreClaimWarningTask

Browse Source
This commit is contained in:
destro174 2022-02-26 11:00:53 +01:00
parent 9ca7f880a0
commit 9ecebc929d
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
View File

@ -238,7 +238,7 @@ public class GriefPrevention extends JavaPlugin
private Pl3xMapHook pl3xmapHook; private Pl3xMapHook pl3xmapHook;
private DatabaseConnection databaseConnection; private DatabaseConnection databaseConnection;
private HashMap<UUID, IgnoreClaimWarningTask> ignoreClaimWarningTasks; public HashMap<UUID, IgnoreClaimWarningTask> ignoreClaimWarningTasks;
//adds a server log entry //adds a server log entry
public static synchronized void AddLogEntry(String entry, CustomLogEntryTypes customLogType, boolean excludeFromServerLogs) public static synchronized void AddLogEntry(String entry, CustomLogEntryTypes customLogType, boolean excludeFromServerLogs)

12
src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View File

@ -305,6 +305,13 @@ class PlayerEventHandler implements Listener
Player player = event.getPlayer(); Player player = event.getPlayer();
PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId()); PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId());
playerData.wasKicked = true; 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... //when a player quits...
@ -357,6 +364,11 @@ class PlayerEventHandler implements Listener
event.setQuitMessage(""); 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 //determines whether or not a login or logout notification should be silenced, depending on how many there have been in the last minute

5
src/main/java/me/ryanhamshire/GriefPrevention/alttd/tasks/IgnoreClaimWarningTask.java
View File

@ -3,6 +3,7 @@ package me.ryanhamshire.GriefPrevention.alttd.tasks;
import me.ryanhamshire.GriefPrevention.GriefPrevention; import me.ryanhamshire.GriefPrevention.GriefPrevention;
import me.ryanhamshire.GriefPrevention.alttd.config.Config; import me.ryanhamshire.GriefPrevention.alttd.config.Config;
import me.ryanhamshire.GriefPrevention.alttd.util.Utils; 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.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver; import net.kyori.adventure.text.minimessage.template.TemplateResolver;
@ -45,7 +46,9 @@ public class IgnoreClaimWarningTask extends BukkitRunnable
Template.template("player", player.name()), Template.template("player", player.name()),
Template.template("time", Utils.getPassedTime(time)) 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(); this.init();
} }
} }