kaboomserver/extras
1
0
Fork 1
mirror of https://github.com/kaboomserver/extras.git synced 2025-02-17 07:10:14 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix bugs in execute checker

Browse source
This commit is contained in:
mathiascode 2019-11-11 23:53:12 +02:00
parent 04227caa4f
commit 002007ece0
4 changed files with 42 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java
View file

@ -351,13 +351,6 @@ class EntitySpawn implements Listener {
event.setCancelled(true);
return;
}
/*PotionMeta potion = (PotionMeta) event.getEntity().getItemStack().getItemMeta();
System.out.println(potion.getColor().asRGB());
if (potion.getColor().asRGB() < 0) {
event.setCancelled(true);
}*/
}
@EventHandler

68
src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java
View file

@ -38,39 +38,43 @@ class PlayerCommand implements Listener {
if (("/minecraft:execute".equals(arr[0].toLowerCase()) ||
"/execute".equals(arr[0].toLowerCase())) &&
arr.length >= 2) {
int asAtCount = 0;
for (int i = 1; i < arr.length; i++) {
if ("run".equalsIgnoreCase(arr[i])) {
if (i+1 < arr.length) {
if ("execute".equalsIgnoreCase(arr[i+1]) ||
"particle".equalsIgnoreCase(arr[i+1]) ||
"save-off".equalsIgnoreCase(arr[i+1]) ||
"stop".equalsIgnoreCase(arr[i+1])) {
Command.broadcastCommandMessage(event.getPlayer(), "Forbidden execute command detected");
event.setCancelled(true);
return;
} else if (i+3 < arr.length &&
"gamerule".equalsIgnoreCase(arr[i+1])) {
if ("randomTickSpeed".equalsIgnoreCase(arr[i+2]) &&
Double.parseDouble(arr[i+3]) > 6) {
event.setMessage(command.replaceFirst("(?i)" + "randomTickSpeed " + arr[i+3], "randomTickSpeed 6"));
return;
} else if ("spawnRadius".equalsIgnoreCase(arr[i+2]) &&
Double.parseDouble(arr[i+3]) > 100) {
event.setMessage(command.replaceFirst("(?i)" + "spawnRadius " + arr[i+3], "spawnRadius 100"));
}
}
}
break;
}
if ("as".equalsIgnoreCase(arr[i]) ||
"at".equalsIgnoreCase(arr[i])) {
for (int i2 = i+1; i2 < arr.length; i2++) {
if ("at".equalsIgnoreCase(arr[i2]) ||
"as".equalsIgnoreCase(arr[i2])) {
Command.broadcastCommandMessage(event.getPlayer(), "Forbidden execute pattern detected");
event.setCancelled(true);
break;
}
}
} else if (i+1 < arr.length &&
"run".equalsIgnoreCase(arr[i])) {
if ("execute".equalsIgnoreCase(arr[i+1]) ||
"particle".equalsIgnoreCase(arr[i+1]) ||
"save-off".equalsIgnoreCase(arr[i+1]) ||
"stop".equalsIgnoreCase(arr[i+1])) {
Command.broadcastCommandMessage(event.getPlayer(), "Forbidden execute command detected");
event.setCancelled(true);
break;
} else if (i+3 < arr.length &&
"gamerule".equalsIgnoreCase(arr[i+1])) {
if ("randomTickSpeed".equalsIgnoreCase(arr[i+2]) &&
Double.parseDouble(arr[i+3]) > 6) {
event.setMessage(command.replaceFirst("(?i)" + "randomTickSpeed " + arr[i+3], "randomTickSpeed 6"));
break;
} else if ("spawnRadius".equalsIgnoreCase(arr[i+2]) &&
Double.parseDouble(arr[i+3]) > 100) {
event.setMessage(command.replaceFirst("(?i)" + "spawnRadius " + arr[i+3], "spawnRadius 100"));
}
}
asAtCount++;
}
}
if (asAtCount >= 2) {
Command.broadcastCommandMessage(event.getPlayer(), "Forbidden execute pattern detected");
event.setCancelled(true);
}
} else if (("/minecraft:gamerule".equalsIgnoreCase(arr[0]) ||
"/gamerule".equalsIgnoreCase(arr[0])) &&
arr.length >= 3) {
@ -81,8 +85,12 @@ class PlayerCommand implements Listener {
Double.parseDouble(arr[2]) > 100) {
event.setMessage(command.replaceFirst(arr[2], "100"));
}
} else if ("/minecraft:give".equalsIgnoreCase(arr[0]) ||
"/give".equalsIgnoreCase(arr[0])) {
} else if ("/minecraft:entitydata".equalsIgnoreCase(arr[0]) ||
"/minecraft:give".equalsIgnoreCase(arr[0]) ||
"/minecraft:replaceitem".equalsIgnoreCase(arr[0]) ||
"/entitydata".equalsIgnoreCase(arr[0]) ||
"/give".equalsIgnoreCase(arr[0]) ||
"/replaceitem".equalsIgnoreCase(arr[0])) {
event.setMessage(command.replace("Color:-", "Color:"));
} else if (("/minecraft:particle".equalsIgnoreCase(arr[0]) ||
"/particle".equalsIgnoreCase(arr[0])) &&

2
src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
View file

@ -137,7 +137,7 @@ class PlayerConnection implements Listener {
new BukkitRunnable() {
public void run() {
if (player != null) {
if (profile != null) {
player.setPlayerProfile(profile);
}
}

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

@ -17,21 +17,10 @@ import org.bukkit.event.server.ServerCommandEvent;
class ServerCommand implements Listener {
@EventHandler
void onServerCommand(ServerCommandEvent event) {
event.setCancelled(true);
final String[] arr = event.getCommand().split(" ");
final String command = event.getCommand();
if (event.getSender() instanceof BlockCommandSender) {
/*Block block = ((BlockCommandSender)event.getSender()).getBlock();
CommandBlock state = (CommandBlock)block.getState();
System.out.println(state.getName());
state.setName("@");
if (state.getName() == null) {
state.setName("");
}
*/
if (Main.consoleCommandBlacklist.contains(arr[0].toLowerCase())) {
event.setCancelled(true);
}
@ -84,7 +73,9 @@ class ServerCommand implements Listener {
event.setCommand(command.replaceFirst(arr[2], "100"));
}
} else if ("minecraft:give".equalsIgnoreCase(arr[0]) ||
"give".equalsIgnoreCase(arr[0])) {
"minecraft:replaceitem".equalsIgnoreCase(arr[0]) ||
"give".equalsIgnoreCase(arr[0]) ||
"replaceitem".equalsIgnoreCase(arr[0])) {
event.setCommand(command.replace("Color:-", "Color:"));
} else if (("minecraft:particle".equalsIgnoreCase(arr[0]) ||
"particle".equalsIgnoreCase(arr[0])) &&