YouHaveTrouble/PreventStabby
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/PreventStabby.git synced 2026-05-11 21:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

more folia support shenanigans

Browse Source
This commit is contained in:
YouHaveTrouble
2024-04-16 16:46:52 +02:00
parent 7f74826e2c
commit 4096cfe152
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/youhavetrouble/preventstabby/PreventStabby.java
+2 -2
View File
@@ -33,7 +33,7 @@ public final class PreventStabby extends JavaPlugin {
sqLite = new DatabaseSQLite("jdbc:sqlite:plugins/PreventStabby/database.db", dbFile, getLogger()); sqLite = new DatabaseSQLite("jdbc:sqlite:plugins/PreventStabby/database.db", dbFile, getLogger());
playerManager = new PlayerManager(this); playerManager = new PlayerManager(this);
// Register listeners TODO // Register listeners
getServer().getPluginManager().registerEvents(new UtilListener(), this); getServer().getPluginManager().registerEvents(new UtilListener(), this);
getServer().getPluginManager().registerEvents(new PlayerListener(), this); getServer().getPluginManager().registerEvents(new PlayerListener(), this);
getServer().getPluginManager().registerEvents(new EnvironmentalListener(this), this); getServer().getPluginManager().registerEvents(new EnvironmentalListener(this), this);
@@ -80,7 +80,7 @@ public final class PreventStabby extends JavaPlugin {
} }
public void reloadPluginConfig(CommandSender commandSender) { public void reloadPluginConfig(CommandSender commandSender) {
getServer().getScheduler().runTaskAsynchronously(this, () -> { getServer().getAsyncScheduler().runNow(this, (task) -> {
reloadPluginConfig(); reloadPluginConfig();
PluginMessages.sendMessage(commandSender, "PreventStabby configuration reloaded."); PluginMessages.sendMessage(commandSender, "PreventStabby configuration reloaded.");
}); });
src/main/java/me/youhavetrouble/preventstabby/commands/GlobalToggleCommand.java
+1 -1
View File
@@ -11,7 +11,7 @@ import java.util.Locale;
public class GlobalToggleCommand { public class GlobalToggleCommand {
public static void globalToggle(CommandSender sender, String[] args) { public static void globalToggle(CommandSender sender, String[] args) {
Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> { Bukkit.getAsyncScheduler().runNow(PreventStabby.getPlugin(), (task) -> {
if (!PreventStabbyPermission.COMMAND_GLOBAL_TOGGLE.doesCommandSenderHave(sender)) { if (!PreventStabbyPermission.COMMAND_GLOBAL_TOGGLE.doesCommandSenderHave(sender)) {
PluginMessages.sendMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission); PluginMessages.sendMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission);
return; return;
src/main/java/me/youhavetrouble/preventstabby/commands/HelpCommand.java
+1 -1
View File
@@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
public class HelpCommand { public class HelpCommand {
public static void help(CommandSender sender, String[] args) { public static void help(CommandSender sender, String[] args) {
Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> { Bukkit.getAsyncScheduler().runNow(PreventStabby.getPlugin(), (task) -> {
if (!PreventStabbyPermission.COMMAND_HELP.doesCommandSenderHave(sender)) { if (!PreventStabbyPermission.COMMAND_HELP.doesCommandSenderHave(sender)) {
PluginMessages.sendMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission); PluginMessages.sendMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission);
src/main/java/me/youhavetrouble/preventstabby/commands/PvpToggleCommand.java
+7 -7
View File
@@ -14,7 +14,7 @@ public class PvpToggleCommand {
private static final PlayerManager playerManager = PreventStabby.getPlugin().getPlayerManager(); private static final PlayerManager playerManager = PreventStabby.getPlugin().getPlayerManager();
public static void toggle(CommandSender sender, String[] args) { public static void toggle(CommandSender sender, String[] args) {
Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> { Bukkit.getAsyncScheduler().runNow(PreventStabby.getPlugin(), (task) -> {
if (!PreventStabbyPermission.COMMAND_TOGGLE.doesCommandSenderHave(sender)) { if (!PreventStabbyPermission.COMMAND_TOGGLE.doesCommandSenderHave(sender)) {
PluginMessages.sendMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission); PluginMessages.sendMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission);
return; return;
@@ -31,7 +31,7 @@ public class PvpToggleCommand {
} }
playerManager.togglePlayerPvpState(player.getUniqueId()).thenAccept(newState -> { playerManager.togglePlayerPvpState(player.getUniqueId()).thenAccept(newState -> {
PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, newState, true); PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, newState, true);
Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> { Bukkit.getGlobalRegionScheduler().run(PreventStabby.getPlugin(), (task1) -> {
if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) { if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) {
Bukkit.getPluginManager().callEvent(toggleEvent); Bukkit.getPluginManager().callEvent(toggleEvent);
} }
@@ -63,7 +63,7 @@ public class PvpToggleCommand {
} }
playerManager.togglePlayerPvpState(player.getUniqueId()).thenAccept(newState -> { playerManager.togglePlayerPvpState(player.getUniqueId()).thenAccept(newState -> {
PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, newState, false); PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, newState, false);
Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> { Bukkit.getGlobalRegionScheduler().run(PreventStabby.getPlugin(), (task1) -> {
if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) { if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) {
Bukkit.getPluginManager().callEvent(toggleEvent); Bukkit.getPluginManager().callEvent(toggleEvent);
} }
@@ -103,7 +103,7 @@ public class PvpToggleCommand {
} }
playerManager.setPlayerPvpState(player.getUniqueId(), true); playerManager.setPlayerPvpState(player.getUniqueId(), true);
PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, true, true); PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, true, true);
Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> { Bukkit.getGlobalRegionScheduler().run(PreventStabby.getPlugin(), (task) -> {
if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) { if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) {
Bukkit.getPluginManager().callEvent(toggleEvent); Bukkit.getPluginManager().callEvent(toggleEvent);
} }
@@ -132,7 +132,7 @@ public class PvpToggleCommand {
PluginMessages.sendMessage(sender, PluginMessages.parsePlayerName(player, message)); PluginMessages.sendMessage(sender, PluginMessages.parsePlayerName(player, message));
playerManager.setPlayerPvpState(player.getUniqueId(), true); playerManager.setPlayerPvpState(player.getUniqueId(), true);
PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, true, false); PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, true, false);
Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> { Bukkit.getGlobalRegionScheduler().run(PreventStabby.getPlugin(), (task) -> {
if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) { if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) {
Bukkit.getPluginManager().callEvent(toggleEvent); Bukkit.getPluginManager().callEvent(toggleEvent);
} }
@@ -162,7 +162,7 @@ public class PvpToggleCommand {
} }
playerManager.setPlayerPvpState(player.getUniqueId(), false); playerManager.setPlayerPvpState(player.getUniqueId(), false);
PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, false, true); PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, false, true);
Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> { Bukkit.getGlobalRegionScheduler().run(PreventStabby.getPlugin(), (task) -> {
if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) { if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) {
Bukkit.getPluginManager().callEvent(toggleEvent); Bukkit.getPluginManager().callEvent(toggleEvent);
} }
@@ -193,7 +193,7 @@ public class PvpToggleCommand {
PluginMessages.sendMessage(sender, PluginMessages.parsePlayerName(player, message)); PluginMessages.sendMessage(sender, PluginMessages.parsePlayerName(player, message));
playerManager.setPlayerPvpState(player.getUniqueId(), false); playerManager.setPlayerPvpState(player.getUniqueId(), false);
PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, false, false); PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, false, false);
Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> { Bukkit.getGlobalRegionScheduler().run(PreventStabby.getPlugin(), (task) -> {
if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) { if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) {
Bukkit.getPluginManager().callEvent(toggleEvent); Bukkit.getPluginManager().callEvent(toggleEvent);
} }
src/main/java/me/youhavetrouble/preventstabby/commands/ReloadCommand.java
+1 -1
View File
@@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
public class ReloadCommand { public class ReloadCommand {
public static void reload(CommandSender sender) { public static void reload(CommandSender sender) {
Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> { Bukkit.getAsyncScheduler().runNow(PreventStabby.getPlugin(), (task) -> {
if (!PreventStabbyPermission.COMMAND_RELOAD.doesCommandSenderHave(sender)) { if (!PreventStabbyPermission.COMMAND_RELOAD.doesCommandSenderHave(sender)) {
PluginMessages.parseMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission); PluginMessages.parseMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission);
return; return;
src/main/resources/plugin.yml
+1
View File
@@ -3,6 +3,7 @@ version: ${project.version}
main: me.youhavetrouble.preventstabby.PreventStabby main: me.youhavetrouble.preventstabby.PreventStabby
authors: [YouHaveTrouble] authors: [YouHaveTrouble]
api-version: 1.20 api-version: 1.20
folia-supported: true
description: Stop people from getting stabbed! description: Stop people from getting stabbed!
soft-depend: soft-depend:
- WorldGuard - WorldGuard