LabodiDavid/SimplifyTools
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Corrected skipping op players - server password

Browse Source
This commit is contained in:
LabodiDavid 2025-04-06 14:43:56 +02:00
parent 2d7192ae9b
commit f5d60cd7e4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/hu/ditservices/listeners/ServerPasswordEvents.java
View File

@ -25,11 +25,16 @@ public class ServerPasswordEvents implements Listener {
this.config = plugin.getConfig(); this.config = plugin.getConfig();
} }
private boolean skipIfOpPlayer(Player player)
{
return player.isOp() && config.getBoolean("ServerPassword.exceptOps");
}
@EventHandler @EventHandler
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (player.isOp() && config.getBoolean("ServerPassword.exceptOps")) { if (skipIfOpPlayer(player)) {
return; return;
} }
@ -62,6 +67,9 @@ public class ServerPasswordEvents implements Listener {
@EventHandler @EventHandler
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
if (skipIfOpPlayer(event.getPlayer())) {
return;
}
if ((!plugin.getServerPasswordData().getAuthenticatedPlayers().getOrDefault(event.getPlayer().getUniqueId(),false)) if ((!plugin.getServerPasswordData().getAuthenticatedPlayers().getOrDefault(event.getPlayer().getUniqueId(),false))
&& config.getBoolean("ServerPassword.preventMove")) { && config.getBoolean("ServerPassword.preventMove")) {
event.setCancelled(true); event.setCancelled(true);
@ -70,6 +78,9 @@ public class ServerPasswordEvents implements Listener {
@EventHandler @EventHandler
public void onBlockBreak(BlockBreakEvent event) { public void onBlockBreak(BlockBreakEvent event) {
if (skipIfOpPlayer(event.getPlayer())) {
return;
}
if ((!plugin.getServerPasswordData().getAuthenticatedPlayers().getOrDefault(event.getPlayer().getUniqueId(),false)) if ((!plugin.getServerPasswordData().getAuthenticatedPlayers().getOrDefault(event.getPlayer().getUniqueId(),false))
&& config.getBoolean("ServerPassword.preventBuild")) { && config.getBoolean("ServerPassword.preventBuild")) {
event.setCancelled(true); event.setCancelled(true);
@ -78,6 +89,9 @@ public class ServerPasswordEvents implements Listener {
@EventHandler @EventHandler
public void onBlockPlace(BlockPlaceEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
if (skipIfOpPlayer(event.getPlayer())) {
return;
}
if ((!plugin.getServerPasswordData().getAuthenticatedPlayers().getOrDefault(event.getPlayer().getUniqueId(),false)) if ((!plugin.getServerPasswordData().getAuthenticatedPlayers().getOrDefault(event.getPlayer().getUniqueId(),false))
&& config.getBoolean("ServerPassword.preventBuild")) { && config.getBoolean("ServerPassword.preventBuild")) {
event.setCancelled(true); event.setCancelled(true);
@ -89,7 +103,7 @@ public class ServerPasswordEvents implements Listener {
Player player = event.getPlayer(); Player player = event.getPlayer();
UUID uuid = player.getUniqueId(); UUID uuid = player.getUniqueId();
if (player.isOp() && config.getBoolean("ServerPassword.exceptOps")) { if (skipIfOpPlayer(player)) {
return; return;
} }