From 8a1eda1b6e7681a198f89608f84f5ee8dc555026 Mon Sep 17 00:00:00 2001 From: Gecolay Date: Wed, 31 Aug 2022 01:24:39 +0200 Subject: [PATCH] Add GSitReloadEvent --- .../src/main/java/dev/geco/gsit/GSitMain.java | 3 +++ .../geco/gsit/api/event/GSitReloadEvent.java | 27 +++++++++++++++++++ .../java/dev/geco/gsit/manager/CManager.java | 2 +- core/src/main/resources/config.yml | 2 +- 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 core/src/main/java/dev/geco/gsit/api/event/GSitReloadEvent.java diff --git a/core/src/main/java/dev/geco/gsit/GSitMain.java b/core/src/main/java/dev/geco/gsit/GSitMain.java index a812d538..86afce3a 100644 --- a/core/src/main/java/dev/geco/gsit/GSitMain.java +++ b/core/src/main/java/dev/geco/gsit/GSitMain.java @@ -7,6 +7,7 @@ import org.bukkit.command.*; import org.bukkit.plugin.java.*; +import dev.geco.gsit.api.event.*; import dev.geco.gsit.cmd.*; import dev.geco.gsit.cmd.tab.*; import dev.geco.gsit.events.*; @@ -250,6 +251,8 @@ private void loadPluginDependencies(CommandSender Sender) { public void reload(CommandSender Sender) { + Bukkit.getPluginManager().callEvent(new GSitReloadEvent(getInstance())); + getCManager().reload(); getMManager().loadMessages(); diff --git a/core/src/main/java/dev/geco/gsit/api/event/GSitReloadEvent.java b/core/src/main/java/dev/geco/gsit/api/event/GSitReloadEvent.java new file mode 100644 index 00000000..d5c35b63 --- /dev/null +++ b/core/src/main/java/dev/geco/gsit/api/event/GSitReloadEvent.java @@ -0,0 +1,27 @@ +package dev.geco.gsit.api.event; + +import org.jetbrains.annotations.*; + +import org.bukkit.event.*; +import org.bukkit.event.server.*; + +import dev.geco.gsit.GSitMain; + +public class GSitReloadEvent extends PluginEvent { + + private static final HandlerList HANDLERS = new HandlerList(); + + private final GSitMain GPM; + + public GSitReloadEvent(GSitMain GPluginMain) { + super(GPluginMain); + GPM = GPluginMain; + } + + public @NotNull GSitMain getPlugin() { return GPM; } + + public @NotNull HandlerList getHandlers() { return HANDLERS; } + + public static HandlerList getHandlerList() { return HANDLERS; } + +} \ No newline at end of file diff --git a/core/src/main/java/dev/geco/gsit/manager/CManager.java b/core/src/main/java/dev/geco/gsit/manager/CManager.java index ca39fd0a..5c52aa54 100644 --- a/core/src/main/java/dev/geco/gsit/manager/CManager.java +++ b/core/src/main/java/dev/geco/gsit/manager/CManager.java @@ -166,7 +166,7 @@ public void reload() { P_LAY_REST = GPM.getConfig().getBoolean("Options.Pose.lay-rest", true); P_LAY_SNORING_SOUNDS = GPM.getConfig().getBoolean("Options.Pose.lay-snoring-sounds", true); P_LAY_SNORING_NIGHT_ONLY = GPM.getConfig().getBoolean("Options.Pose.lay-snoring-night-only", true); - P_LAY_NIGHT_SKIP = GPM.getConfig().getBoolean("Options.Pose.lay-night-skip", false); + P_LAY_NIGHT_SKIP = GPM.getConfig().getBoolean("Options.Pose.lay-night-skip", true); C_GET_UP_SNEAK = GPM.getConfig().getBoolean("Options.Crawl.get-up-sneak", true); C_DOUBLE_SNEAK = GPM.getConfig().getBoolean("Options.Crawl.double-sneak", false); diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml index ce94df92..f75e37c8 100644 --- a/core/src/main/resources/config.yml +++ b/core/src/main/resources/config.yml @@ -107,7 +107,7 @@ Options: lay-snoring-night-only: true # Defines whether a lying player counts for skipping the night (At least one player must be sleeping in a bed to skip the night!) - lay-night-skip: false + lay-night-skip: true