diff --git a/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 267f4c4..8d2c587 100644 Binary files a/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/environmentex/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/environmentex/.gradle/caches/paperweight/taskCache/reobfJar.log b/environmentex/.gradle/caches/paperweight/taskCache/reobfJar.log index 9cdd84f..db01c5a 100644 --- a/environmentex/.gradle/caches/paperweight/taskCache/reobfJar.log +++ b/environmentex/.gradle/caches/paperweight/taskCache/reobfJar.log @@ -1,2 +1,2 @@ Command: /opt/homebrew/Cellar/openjdk/23.0.2/libexec/openjdk.jdk/Contents/Home/bin/java -Xmx1G -classpath /Users/janik/.gradle/caches/modules-2/files-2.1/net.fabricmc/tiny-remapper/0.11.1/6c1f29838864ba8f495855edfc8ef17706fedb5d/tiny-remapper-0.11.1-fat.jar net.fabricmc.tinyremapper.Main /Users/janik/Desktop/MCPlugins/environmentex-1.0-SNAPSHOT.jar /Users/janik/Desktop/MCPlugins/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar /Users/janik/Desktop/MCPlugins/environmentex/.gradle/caches/paperweight/taskCache/reobfMappings.tiny mojang spigot /Users/janik/Desktop/MCPlugins/environmentex/.gradle/caches/paperweight/taskCache/mappedServerJar.jar --threads=1 -[INFO] Finished after 1350,93 ms. +[INFO] Finished after 998,05 ms. diff --git a/environmentex/build/classes/java/main/de/hessj/environmentex/App.class b/environmentex/build/classes/java/main/de/hessj/environmentex/App.class index 3afd709..e428b1e 100644 Binary files a/environmentex/build/classes/java/main/de/hessj/environmentex/App.class and b/environmentex/build/classes/java/main/de/hessj/environmentex/App.class differ diff --git a/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar b/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar index eafdd0f..1cfe040 100644 Binary files a/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar and b/environmentex/build/libs/environmentex-1.0-SNAPSHOT-reobf.jar differ diff --git a/environmentex/build/tmp/compileJava/previous-compilation-data.bin b/environmentex/build/tmp/compileJava/previous-compilation-data.bin index d780927..b413f2b 100644 Binary files a/environmentex/build/tmp/compileJava/previous-compilation-data.bin and b/environmentex/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/environmentex/src/main/java/de/hessj/environmentex/App.java b/environmentex/src/main/java/de/hessj/environmentex/App.java index 7ec04c1..dc62e64 100755 --- a/environmentex/src/main/java/de/hessj/environmentex/App.java +++ b/environmentex/src/main/java/de/hessj/environmentex/App.java @@ -462,6 +462,7 @@ public class App extends JavaPlugin { pM.registerEvents(new CustomMusicDiscs(), this); pM.registerEvents(new PinFeature(), this); pM.registerEvents(new SquidPrevention(), this); + pM.registerEvents(new EntityMuter(), this); getCommand("test").setExecutor(new EnvironmentExCommands()); getCommand("y").setExecutor(new EnvironmentExCommands()); getCommand("n").setExecutor(new EnvironmentExCommands()); diff --git a/helper/.gradle/8.9/checksums/checksums.lock b/helper/.gradle/8.9/checksums/checksums.lock deleted file mode 100644 index 02fcad4..0000000 Binary files a/helper/.gradle/8.9/checksums/checksums.lock and /dev/null differ diff --git a/helper/.gradle/8.9/dependencies-accessors/gc.properties b/helper/.gradle/8.9/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/helper/.gradle/8.9/fileChanges/last-build.bin b/helper/.gradle/8.9/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/helper/.gradle/8.9/fileChanges/last-build.bin and /dev/null differ diff --git a/helper/.gradle/8.9/fileHashes/fileHashes.lock b/helper/.gradle/8.9/fileHashes/fileHashes.lock deleted file mode 100644 index f215430..0000000 Binary files a/helper/.gradle/8.9/fileHashes/fileHashes.lock and /dev/null differ diff --git a/helper/.gradle/8.9/gc.properties b/helper/.gradle/8.9/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/helper/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/helper/.gradle/buildOutputCleanup/buildOutputCleanup.lock index eed8326..e5a5dd5 100644 Binary files a/helper/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/helper/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/helper/.gradle/caches/paperweight/taskCache/reobfJar.log b/helper/.gradle/caches/paperweight/taskCache/reobfJar.log index 7dbd927..d393bbb 100644 --- a/helper/.gradle/caches/paperweight/taskCache/reobfJar.log +++ b/helper/.gradle/caches/paperweight/taskCache/reobfJar.log @@ -1,2 +1,2 @@ Command: /opt/homebrew/Cellar/openjdk/23.0.2/libexec/openjdk.jdk/Contents/Home/bin/java -Xmx1G -classpath /Users/janik/.gradle/caches/modules-2/files-2.1/net.fabricmc/tiny-remapper/0.10.4/d78e8e115ba5ac99421ce2d5e84e88b91a5f08b7/tiny-remapper-0.10.4-fat.jar net.fabricmc.tinyremapper.Main /Users/janik/Desktop/MCPlugins/helper-1.0-SNAPSHOT.jar /Users/janik/Desktop/MCPlugins/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar /Users/janik/Desktop/MCPlugins/helper/.gradle/caches/paperweight/taskCache/reobfMappings.tiny mojang spigot /Users/janik/Desktop/MCPlugins/helper/.gradle/caches/paperweight/taskCache/mappedServerJar.jar --threads=1 -Finished after 822,94 ms. +Finished after 1114,03 ms. diff --git a/helper/build/classes/java/main/de/hessj/helper/Helper$Type.class b/helper/build/classes/java/main/de/hessj/helper/Helper$Type.class index 7b9d49d..d0847a1 100644 Binary files a/helper/build/classes/java/main/de/hessj/helper/Helper$Type.class and b/helper/build/classes/java/main/de/hessj/helper/Helper$Type.class differ diff --git a/helper/build/classes/java/main/de/hessj/helper/Helper.class b/helper/build/classes/java/main/de/hessj/helper/Helper.class index 5360478..cfe4278 100644 Binary files a/helper/build/classes/java/main/de/hessj/helper/Helper.class and b/helper/build/classes/java/main/de/hessj/helper/Helper.class differ diff --git a/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar b/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar index a2181e6..3aa8096 100644 Binary files a/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar and b/helper/build/libs/helper-1.0-SNAPSHOT-reobf.jar differ diff --git a/helper/build/reports/problems/problems-report.html b/helper/build/reports/problems/problems-report.html index caa33c7..395292b 100644 --- a/helper/build/reports/problems/problems-report.html +++ b/helper/build/reports/problems/problems-report.html @@ -650,7 +650,7 @@ code + .copy-button { diff --git a/helper/build/tmp/compileJava/previous-compilation-data.bin b/helper/build/tmp/compileJava/previous-compilation-data.bin index e533156..54fd6c0 100644 Binary files a/helper/build/tmp/compileJava/previous-compilation-data.bin and b/helper/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/helper/src/main/java/de/hessj/helper/Helper.java b/helper/src/main/java/de/hessj/helper/Helper.java index f8a06af..47cafbe 100755 --- a/helper/src/main/java/de/hessj/helper/Helper.java +++ b/helper/src/main/java/de/hessj/helper/Helper.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; @@ -174,7 +175,7 @@ public class Helper { } } - public static String itemStackArrayToBase64(ItemStack[] itemArray) throws IllegalStateException { + public static String itemStackArrayToBase64(ItemStack[] itemArray) throws IllegalStateException { try { byte[] iss = ItemStack.serializeItemsAsBytes(itemArray); @@ -186,6 +187,9 @@ public class Helper { public static ItemStack[] itemStackArrayFromBase64(String data) throws IOException { try { + if (data == "null") { + data = "AQAAAAA="; + } ItemStack[] is = ItemStack.deserializeItemsFromBytes(Base64Coder.decodeLines(data)); return is; } catch (IllegalStateException e) {