diff --git a/gradle.properties b/gradle.properties index ed8029e..8edeb2d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.earthme.luminol version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -foliaRef=32c2b33dccfa65e1231021b2218cdf5add003e96 +foliaRef=e39039dd11b14f3a23cabbdb7ca90508c8c6e509 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-server/minecraft-patches/features/0008-Add-config-to-verify-signature-only-in-online-mode.patch b/luminol-server/minecraft-patches/features/0008-Add-config-to-verify-signature-only-in-online-mode.patch index 5dde74b..c10c580 100644 --- a/luminol-server/minecraft-patches/features/0008-Add-config-to-verify-signature-only-in-online-mode.patch +++ b/luminol-server/minecraft-patches/features/0008-Add-config-to-verify-signature-only-in-online-mode.patch @@ -17,16 +17,3 @@ index 41a9cc693183e96c83837692e93b177a521d6789..f4a2d1a2d467808b9cb75fc32765ddc2 throw new ProfilePublicKey.ValidationException(INVALID_SIGNATURE, org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PUBLIC_KEY_SIGNATURE); // Paper - kick event causes } else { return new ProfilePublicKey(data); -diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java -index 30b97cdcd495490ef65c2ab9dfc39a39c93002ca..1baed35051e9f0f5331bc8ae62a9a8848c3ee322 100644 ---- a/net/minecraft/world/level/block/TripWireHookBlock.java -+++ b/net/minecraft/world/level/block/TripWireHookBlock.java -@@ -215,7 +215,7 @@ public class TripWireHookBlock extends Block { - BlockState blockState2 = blockStates[i2]; - if (blockState2 != null) { - BlockState blockState3 = level.getBlockState(blockPos1); -- if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) { -+ if (me.earthme.luminol.config.modules.misc.TripwireConfig.enabled || blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) { // Luminol - Add config for tripwire dupe - level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3); - } - } diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/TripwireConfig.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/TripwireConfig.java.patch deleted file mode 100644 index 44b830c..0000000 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/TripwireConfig.java.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /dev/null -+++ b/src/main/java/me/earthme/luminol/config/modules/misc/TripwireConfig.java -@@ -1,0 +_,20 @@ -+package me.earthme.luminol.config.modules.misc; -+ -+import me.earthme.luminol.config.ConfigInfo; -+import me.earthme.luminol.config.EnumConfigCategory; -+import me.earthme.luminol.config.IConfigModule; -+ -+public class TripwireConfig implements IConfigModule { -+ @ConfigInfo(baseName = "enabled") -+ public static boolean enabled = false; -+ -+ @Override -+ public EnumConfigCategory getCategory() { -+ return EnumConfigCategory.MISC; -+ } -+ -+ @Override -+ public String getBaseName() { -+ return "tripwire_dupe"; -+ } -+}