kaboomserver/extras
1
0
Fork 0
mirror of https://github.com/kaboomserver/extras.git synced 2025-01-08 23:48:14 +00:00
Code Issues Projects Releases Wiki Activity

Improve particle count limiter

Browse source
This commit is contained in:
kaboom 2021-08-25 11:04:41 +03:00
parent 4e5e257534
commit 7da29aeb6d
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,14 +103,27 @@ public final class ServerCommand implements Listener {
} }
} else if ("give".equalsIgnoreCase(arr[i + 1])) { } else if ("give".equalsIgnoreCase(arr[i + 1])) {
if (Double.parseDouble(arr[arr.length - 1]) > 64) { if (Double.parseDouble(arr[arr.length - 1]) > 64) {
// Limit item count
arr[arr.length - 1] = "64"; arr[arr.length - 1] = "64";
return String.join(" ", arr); return String.join(" ", arr);
} }
} else if ("particle".equalsIgnoreCase(arr[i + 1])) {
int[] numArgs = {i + 15, i + 11};
for (int j : numArgs) {
if (arr.length < j || arr.length > j + 2) {
continue;
}
if (Double.parseDouble(arr[j - 1]) > 10) {
// Limit particle count
arr[j - 1] = "10";
return String.join(" ", arr);
}
}
} else if ("bossbar".equalsIgnoreCase(arr[i + 1]) } else if ("bossbar".equalsIgnoreCase(arr[i + 1])
|| "fill".equalsIgnoreCase(arr[i + 1]) || "fill".equalsIgnoreCase(arr[i + 1])
|| "setblock".equalsIgnoreCase(arr[i + 1]) || "setblock".equalsIgnoreCase(arr[i + 1])
|| "tellraw".equalsIgnoreCase(arr[i + 1]) || "tellraw".equalsIgnoreCase(arr[i + 1])
|| "title".equalsIgnoreCase(arr[i + 1])) { || "title".equalsIgnoreCase(arr[i + 1])) {
final String charCommand = parseCharCodes(command); final String charCommand = parseCharCodes(command);
if (charCommand.contains("selector")) { if (charCommand.contains("selector")) {
return "cancel"; return "cancel";
@ -142,16 +155,23 @@ public final class ServerCommand implements Listener {
case "/minecraft:give": case "/minecraft:give":
case "/give": case "/give":
if (Double.parseDouble(arr[arr.length - 1]) > 64) { if (Double.parseDouble(arr[arr.length - 1]) > 64) {
// Limit item count
arr[arr.length - 1] = "64"; arr[arr.length - 1] = "64";
return String.join(" ", arr); return String.join(" ", arr);
} }
break; break;
case "/minecraft:particle": case "/minecraft:particle":
case "/particle": case "/particle":
if (arr.length >= 10 int[] numArgs = {14, 10};
&& Double.parseDouble(arr[9]) > 10) { for (int i : numArgs) {
arr[9] = "10"; if (arr.length < i || arr.length > i + 2) {
return String.join(" ", arr); continue;
}
if (Double.parseDouble(arr[i - 1]) > 10) {
// Limit particle count
arr[i - 1] = "10";
return String.join(" ", arr);
}
} }
break; break;
case "/minecraft:spreadplayers": case "/minecraft:spreadplayers":