Plexus
/
Plex
mirror of https://github.com/plexusorg/Plex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Plexus:6b7c076c41a20546cb0439913de998976e53b1b7
Branches Tags
Plexus:master
Plexus:velocity-4
Plexus:server
Plexus:ver/1.3
Plexus:brigadier
Plexus:ver/1.2
Plexus:ver/1.1.1
Plexus:ver/1.1
Plexus:ver/1.0.3
Plexus:ver/1.0.2
Plexus:ver/1.0.1
Plexus:ver/1.0
Plexus:ver/0.9
Plexus:ver/0.8
Plexus:ver/0.7
Plexus:1.3
Plexus:1.2
Plexus:1.1.1
Plexus:1.1
Plexus:1.0.3
Plexus:1.0.2
Plexus:1.0.1
Plexus:1.0
Plexus:0.9
Plexus:0.8
Plexus:0.7
...
compare: Plexus:6ce48438295293a8c345017f6fbe3162ebb8aa96
Branches Tags
Plexus:master
Plexus:velocity-4
Plexus:server
Plexus:ver/1.3
Plexus:brigadier
Plexus:ver/1.2
Plexus:ver/1.1.1
Plexus:ver/1.1
Plexus:ver/1.0.3
Plexus:ver/1.0.2
Plexus:ver/1.0.1
Plexus:ver/1.0
Plexus:ver/0.9
Plexus:ver/0.8
Plexus:ver/0.7
Plexus:1.3
Plexus:1.2
Plexus:1.1.1
Plexus:1.1
Plexus:1.0.3
Plexus:1.0.2
Plexus:1.0.1
Plexus:1.0
Plexus:0.9
Plexus:0.8
Plexus:0.7

2 Commits
6b7c076c41 ... 6ce4843829

Author SHA1 Message Date
Telesphoreo 6ce4843829
Minor fix 2024-01-27 15:56:40 -06:00
Telesphoreo 7298c8669a
Attempt to fix bans not working 2024-01-27 15:48:21 -06:00
2 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

7
server/src/main/java/dev/plex/command/impl/BanCMD.java
View File

@ -1,6 +1,5 @@
package dev.plex.command.impl; package dev.plex.command.impl;
import dev.plex.Plex;
import dev.plex.cache.DataUtils; import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand; import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandParameters;
@ -32,7 +31,7 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@CommandParameters(name = "ban", usage = "/<command> <player> [-nrb] [reason] [-nrb]", aliases = "offlineban,gtfo", description = "Bans a player, offline or online") @CommandParameters(name = "ban", usage = "/<command> <player> [reason] [-nrb]", aliases = "offlineban,gtfo", description = "Bans a player, offline or online")
@CommandPermissions(permission = "plex.ban", source = RequiredCommandSource.ANY) @CommandPermissions(permission = "plex.ban", source = RequiredCommandSource.ANY)
public class BanCMD extends PlexCommand public class BanCMD extends PlexCommand
@ -84,7 +83,7 @@ public class BanCMD extends PlexCommand
punishment.setIp(player != null ? player.getAddress().getAddress().getHostAddress().trim() : plexPlayer.getIps().get(plexPlayer.getIps().size() - 1)); punishment.setIp(player != null ? player.getAddress().getAddress().getHostAddress().trim() : plexPlayer.getIps().get(plexPlayer.getIps().size() - 1));
plugin.getPunishmentManager().punish(plexPlayer, punishment); plugin.getPunishmentManager().punish(plexPlayer, punishment);
PlexUtils.broadcast(messageComponent("banningPlayer", sender.getName(), plexPlayer.getName())); PlexUtils.broadcast(messageComponent("banningPlayer", sender.getName(), plexPlayer.getName()));
Bukkit.getScheduler().runTask(Plex.get(), () -> Bukkit.getGlobalRegionScheduler().execute(plugin, () ->
{ {
if (player != null) if (player != null)
{ {
@ -123,7 +122,7 @@ public class BanCMD extends PlexCommand
else if (plugin.getCoreProtectHook().hasCoreProtect()) else if (plugin.getCoreProtectHook().hasCoreProtect())
{ {
PlexLog.debug("Testing coreprotect"); PlexLog.debug("Testing coreprotect");
Bukkit.getAsyncScheduler().runNow(plugin, scheduledTask -> Bukkit.getGlobalRegionScheduler().run(plugin, scheduledTask ->
{ {
plugin.getCoreProtectHook().coreProtectAPI().performRollback(86400, Collections.singletonList(plexPlayer.getName()), null, null, null, null, 0, null); plugin.getCoreProtectHook().coreProtectAPI().performRollback(86400, Collections.singletonList(plexPlayer.getName()), null, null, null, null, 0, null);
}); });

5
server/src/main/java/dev/plex/listener/impl/PlayerListener.java
View File

@ -6,6 +6,7 @@ import dev.plex.meta.PlayerMeta;
import dev.plex.player.PlexPlayer; import dev.plex.player.PlexPlayer;
import dev.plex.util.PlexLog; import dev.plex.util.PlexLog;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import java.util.List;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
@ -18,8 +19,6 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import java.util.List;
public class PlayerListener<T> extends PlexListener public class PlayerListener<T> extends PlexListener
{ {
// setting up a player's data // setting up a player's data
@ -96,7 +95,7 @@ public class PlayerListener<T> extends PlexListener
PlexPlayer player = DataUtils.getPlayer(event.getPlayer().getUniqueId()); PlexPlayer player = DataUtils.getPlayer(event.getPlayer().getUniqueId());
if (player.isLockedUp()) if (player.isLockedUp())
{ {
Bukkit.getScheduler().runTaskLater(plugin, () -> event.getPlayer().openInventory(event.getInventory()), 1L); Bukkit.getGlobalRegionScheduler().runDelayed(plugin, (scheduledTask) -> event.getPlayer().openInventory(event.getInventory()), 1L);
} }
} }