From 753ae13bb956620018d970e1cbb140ef38538607 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 28 Jul 2019 22:03:05 -0300 Subject: [PATCH] increased mining trust --- ...rverPlayerInteractionManager_ghostBlocksMixin.java | 11 +++-------- src/main/java/carpet/settings/CarpetSettings.java | 6 +++++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java index bb2377b5..80eb15a7 100644 --- a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java @@ -12,6 +12,8 @@ import net.minecraft.world.BlockView; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.spongepowered.asm.mixin.injection.Redirect; //needs tests, WIP @@ -43,18 +45,11 @@ public class ServerPlayerInteractionManager_ghostBlocksMixin return progress; } - /* @ModifyConstant(method = "method_14263", constant = @Constant(doubleValue = 36D)) private double addDistance(double original) { if (CarpetSettings.miningGhostBlockFix) - return 1024D; + return 1024D; // blocks 32 distance return original; } - @Inject(method = "method_14263", at = @At("HEAD")) - private void logAction(BlockPos blockPos_1, PlayerActionC2SPacket.Action playerActionC2SPacket$Action_1, Direction direction_1, int int_1, CallbackInfo ci) - { - CarpetSettings.LOG.error("Got action: "+playerActionC2SPacket$Action_1+"("+int_1+")"); - } - */ } diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/settings/CarpetSettings.java index e0017634..33b8346a 100644 --- a/src/main/java/carpet/settings/CarpetSettings.java +++ b/src/main/java/carpet/settings/CarpetSettings.java @@ -229,7 +229,11 @@ public class CarpetSettings @Rule(desc = "smooth client animations with low tps settings", extra = "works only in SP, and will slow down players", category = CREATIVE) public static boolean smoothClientAnimations; - @Rule(desc="Fixes mining ghost blocks by allowing ANY mining speed from clients", category = SURVIVAL) + @Rule( + desc="Fixes mining ghost blocks by trusting clients with block breaking", + extra="Increases player allowed mining distance to 32 blocks", + category = SURVIVAL + ) public static boolean miningGhostBlockFix; private static class PushLimitLimits extends Validator {