kaboomserver/extras
1
0
Fork 1
mirror of https://github.com/kaboomserver/extras.git synced 2024-11-23 16:08:18 -05:00
Code Issues Projects Releases Packages Wiki Activity

Avoid errors in checker

Browse source
This commit is contained in:
mathiascode 2019-09-18 23:17:45 +03:00
parent bb082a614d
commit def1b6b32f
4 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java Normal file → Executable file
View file

@ -24,12 +24,18 @@ class PlayerCommand implements Listener {
final String[] arr = event.getMessage().split(" "); final String[] arr = event.getMessage().split(" ");
final String command = event.getMessage(); final String command = event.getMessage();
final UUID playerUuid = event.getPlayer().getUniqueId(); final UUID playerUuid = event.getPlayer().getUniqueId();
final long millisDifference = System.currentTimeMillis() - main.commandMillisList.get(playerUuid);
if (main.commandMillisList.get(playerUuid) != null) {
final long millisDifference = System.currentTimeMillis() - main.commandMillisList.get(playerUuid);
if (millisDifference < 200) {
event.setCancelled(true);
}
}
main.commandMillisList.put(playerUuid, System.currentTimeMillis()); main.commandMillisList.put(playerUuid, System.currentTimeMillis());
if (millisDifference < 200) { if (event.isCancelled()) {
event.setCancelled(true);
return; return;
} }

3
src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java Normal file → Executable file
View file

@ -120,9 +120,6 @@ class PlayerConnection implements Listener {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
main.commandMillisList.put(player.getUniqueId(), System.currentTimeMillis());
main.interactMillisList.put(player.getUniqueId(), System.currentTimeMillis());
event.allow(); event.allow();
player.setOp(true); player.setOp(true);

15
src/main/java/pw/kaboom/extras/modules/player/PlayerInteract.java Normal file → Executable file
View file

@ -19,12 +19,15 @@ class PlayerInteract implements Listener {
void onPlayerInteract(PlayerInteractEvent event) { void onPlayerInteract(PlayerInteractEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final UUID playerUuid = event.getPlayer().getUniqueId(); final UUID playerUuid = event.getPlayer().getUniqueId();
final long millisDifference = System.currentTimeMillis() - main.interactMillisList.get(playerUuid);
if (main.interactMillisList.get(playerUuid) != null) {
main.interactMillisList.put(playerUuid, System.currentTimeMillis()); final long millisDifference = System.currentTimeMillis() - main.interactMillisList.get(playerUuid);
if (millisDifference < 150) { if (millisDifference < 150) {
event.setCancelled(true); event.setCancelled(true);
}
} }
main.interactMillisList.put(playerUuid, System.currentTimeMillis());
} }
} }

17
src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java
View file

@ -21,7 +21,22 @@ class ServerCommand implements Listener {
final String[] arr = event.getCommand().split(" "); final String[] arr = event.getCommand().split(" ");
final String command = event.getCommand(); final String command = event.getCommand();
if (main.consoleCommandBlacklist.contains(arr[0].toLowerCase())) { if (("minecraft:execute".equals(arr[0].toLowerCase()) ||
"execute".equals(arr[0].toLowerCase())) &&
arr.length >= 1) {
final StringBuilder stringBuilder = new StringBuilder();
for (int i = 1; i < arr.length; i++) {
stringBuilder.append(arr[i] + " ");
}
if (stringBuilder.toString().toLowerCase().contains("run execute") ||
stringBuilder.toString().toLowerCase().contains("run gamerule randomtickspeed") ||
stringBuilder.toString().toLowerCase().contains("run particle") ||
stringBuilder.toString().toLowerCase().contains("run save-off") ||
stringBuilder.toString().toLowerCase().contains("run stop")) {
event.setCancelled(true);
}
} else if (main.consoleCommandBlacklist.contains(arr[0].toLowerCase())) {
event.setCancelled(true); event.setCancelled(true);
} else if (("minecraft:gamerule".equalsIgnoreCase(arr[0]) || } else if (("minecraft:gamerule".equalsIgnoreCase(arr[0]) ||
"gamerule".equalsIgnoreCase(arr[0])) && "gamerule".equalsIgnoreCase(arr[0])) &&