mirror of
https://github.com/YouHaveTrouble/PreventStabby.git
synced 2026-05-11 21:06:55 +00:00
more folia support shenanigans
This commit is contained in:
@@ -33,7 +33,7 @@ public final class PreventStabby extends JavaPlugin {
|
||||
sqLite = new DatabaseSQLite("jdbc:sqlite:plugins/PreventStabby/database.db", dbFile, getLogger());
|
||||
playerManager = new PlayerManager(this);
|
||||
|
||||
// Register listeners TODO
|
||||
// Register listeners
|
||||
getServer().getPluginManager().registerEvents(new UtilListener(), this);
|
||||
getServer().getPluginManager().registerEvents(new PlayerListener(), this);
|
||||
getServer().getPluginManager().registerEvents(new EnvironmentalListener(this), this);
|
||||
@@ -80,7 +80,7 @@ public final class PreventStabby extends JavaPlugin {
|
||||
}
|
||||
|
||||
public void reloadPluginConfig(CommandSender commandSender) {
|
||||
getServer().getScheduler().runTaskAsynchronously(this, () -> {
|
||||
getServer().getAsyncScheduler().runNow(this, (task) -> {
|
||||
reloadPluginConfig();
|
||||
PluginMessages.sendMessage(commandSender, "PreventStabby configuration reloaded.");
|
||||
});
|
||||
|
||||
@@ -11,7 +11,7 @@ import java.util.Locale;
|
||||
|
||||
public class GlobalToggleCommand {
|
||||
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)) {
|
||||
PluginMessages.sendMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission);
|
||||
return;
|
||||
|
||||
@@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
|
||||
|
||||
public class HelpCommand {
|
||||
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)) {
|
||||
PluginMessages.sendMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission);
|
||||
|
||||
@@ -14,7 +14,7 @@ public class PvpToggleCommand {
|
||||
private static final PlayerManager playerManager = PreventStabby.getPlugin().getPlayerManager();
|
||||
|
||||
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)) {
|
||||
PluginMessages.sendMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission);
|
||||
return;
|
||||
@@ -31,7 +31,7 @@ public class PvpToggleCommand {
|
||||
}
|
||||
playerManager.togglePlayerPvpState(player.getUniqueId()).thenAccept(newState -> {
|
||||
PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, newState, true);
|
||||
Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> {
|
||||
Bukkit.getGlobalRegionScheduler().run(PreventStabby.getPlugin(), (task1) -> {
|
||||
if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) {
|
||||
Bukkit.getPluginManager().callEvent(toggleEvent);
|
||||
}
|
||||
@@ -63,7 +63,7 @@ public class PvpToggleCommand {
|
||||
}
|
||||
playerManager.togglePlayerPvpState(player.getUniqueId()).thenAccept(newState -> {
|
||||
PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, newState, false);
|
||||
Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> {
|
||||
Bukkit.getGlobalRegionScheduler().run(PreventStabby.getPlugin(), (task1) -> {
|
||||
if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) {
|
||||
Bukkit.getPluginManager().callEvent(toggleEvent);
|
||||
}
|
||||
@@ -103,7 +103,7 @@ public class PvpToggleCommand {
|
||||
}
|
||||
playerManager.setPlayerPvpState(player.getUniqueId(), 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) {
|
||||
Bukkit.getPluginManager().callEvent(toggleEvent);
|
||||
}
|
||||
@@ -132,7 +132,7 @@ public class PvpToggleCommand {
|
||||
PluginMessages.sendMessage(sender, PluginMessages.parsePlayerName(player, message));
|
||||
playerManager.setPlayerPvpState(player.getUniqueId(), true);
|
||||
PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, true, false);
|
||||
Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> {
|
||||
Bukkit.getGlobalRegionScheduler().run(PreventStabby.getPlugin(), (task) -> {
|
||||
if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) {
|
||||
Bukkit.getPluginManager().callEvent(toggleEvent);
|
||||
}
|
||||
@@ -162,7 +162,7 @@ public class PvpToggleCommand {
|
||||
}
|
||||
playerManager.setPlayerPvpState(player.getUniqueId(), false);
|
||||
PlayerTogglePvpEvent toggleEvent = new PlayerTogglePvpEvent(player, false, true);
|
||||
Bukkit.getScheduler().runTask(PreventStabby.getPlugin(), () -> {
|
||||
Bukkit.getGlobalRegionScheduler().run(PreventStabby.getPlugin(), (task) -> {
|
||||
if (PlayerTogglePvpEvent.getHandlerList().getRegisteredListeners().length > 0) {
|
||||
Bukkit.getPluginManager().callEvent(toggleEvent);
|
||||
}
|
||||
@@ -193,7 +193,7 @@ public class PvpToggleCommand {
|
||||
PluginMessages.sendMessage(sender, PluginMessages.parsePlayerName(player, message));
|
||||
playerManager.setPlayerPvpState(player.getUniqueId(), 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) {
|
||||
Bukkit.getPluginManager().callEvent(toggleEvent);
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
|
||||
public class ReloadCommand {
|
||||
|
||||
public static void reload(CommandSender sender) {
|
||||
Bukkit.getScheduler().runTaskAsynchronously(PreventStabby.getPlugin(), () -> {
|
||||
Bukkit.getAsyncScheduler().runNow(PreventStabby.getPlugin(), (task) -> {
|
||||
if (!PreventStabbyPermission.COMMAND_RELOAD.doesCommandSenderHave(sender)) {
|
||||
PluginMessages.parseMessage(sender, PreventStabby.getPlugin().getConfigCache().no_permission);
|
||||
return;
|
||||
|
||||
@@ -3,6 +3,7 @@ version: ${project.version}
|
||||
main: me.youhavetrouble.preventstabby.PreventStabby
|
||||
authors: [YouHaveTrouble]
|
||||
api-version: 1.20
|
||||
folia-supported: true
|
||||
description: Stop people from getting stabbed!
|
||||
soft-depend:
|
||||
- WorldGuard
|
||||
|
||||
Reference in New Issue
Block a user