From 87daa0b4da96af4eff775865d19a9df33c26dacc Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 31 Jul 2019 17:08:25 -0300 Subject: [PATCH] tweaks to trusted server --- src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java | 3 ++- .../ServerPlayNetworkHandler_antiCheatDisabledMixin.java | 3 --- .../ServerPlayerInteractionManager_ghostBlocksMixin.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java b/src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java index 4f96e42f..79821518 100644 --- a/src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java +++ b/src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java @@ -2,6 +2,7 @@ package carpet.mixins; import carpet.settings.CarpetSettings; import net.minecraft.client.network.packet.EntityPositionS2CPacket; +import net.minecraft.client.network.packet.VehicleMoveS2CPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.mob.MobEntity; @@ -40,8 +41,8 @@ public abstract class PlayerEntity_horseFixMixin extends Entity ((ServerWorld) getEntityWorld()).method_14178().sendToNearbyPlayers(this, new EntityPositionS2CPacket(getVehicle())); // not sure if player at this point is actually considered to be next to the exiting vehicle ((ServerPlayerEntity)(Object)this).networkHandler.sendPacket(new EntityPositionS2CPacket(getVehicle())); + ((ServerPlayerEntity)(Object)this).networkHandler.sendPacket(new VehicleMoveS2CPacket(getVehicle())); } } } - } diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java index 9138fbf1..9ca0702e 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java @@ -75,7 +75,4 @@ public abstract class ServerPlayNetworkHandler_antiCheatDisabledMixin return false; return serverPlayerEntity.onGround; } - - - } diff --git a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java index 80eb15a7..87300ca7 100644 --- a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java @@ -16,7 +16,6 @@ import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.spongepowered.asm.mixin.injection.Redirect; -//needs tests, WIP @Mixin(ServerPlayerInteractionManager.class) public class ServerPlayerInteractionManager_ghostBlocksMixin { @@ -34,7 +33,7 @@ public class ServerPlayerInteractionManager_ghostBlocksMixin float progress = blockState.calcBlockBreakingDelta(playerEntity_1, blockView_1, blockPos_1); if (CarpetSettings.miningGhostBlockFix && (playerActionC2SPacket$Action_1 == PlayerActionC2SPacket.Action.START_DESTROY_BLOCK) && - !playerEntity_1.onGround && + !playerEntity_1.onGround && !playerEntity_1.isClimbing() && !playerEntity_1.isFallFlying() && progress >= 0.2 ) return progress*5;