diff --git a/src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java b/src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java new file mode 100644 index 00000000..8092d810 --- /dev/null +++ b/src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java @@ -0,0 +1,35 @@ +package carpet.mixins; + +import carpet.CarpetServer; +import carpet.settings.CarpetSettings; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ElytraItem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +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.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(PlayerEntity.class) +public abstract class PlayerEntity_antiCheatDisabled +{ + @Shadow public abstract ItemStack getEquippedStack(EquipmentSlot equipmentSlot_1); + + @Shadow public abstract void method_23669(); + + @Inject(method = "method_23668", at = @At("HEAD"), cancellable = true) + private void allowDeploys(CallbackInfoReturnable cir) + { + if (CarpetSettings.antiCheatDisabled && CarpetServer.minecraft_server.isDedicated()) + { + ItemStack itemStack_1 = getEquippedStack(EquipmentSlot.CHEST); + if (itemStack_1.getItem() == Items.ELYTRA && ElytraItem.isUsable(itemStack_1)) { + method_23669(); + cir.setReturnValue(true); + } + } + } +} diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index 817a3955..98ff11d6 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -88,6 +88,7 @@ "PistonBlock_rotatorBlockMixin", "ServerPlayNetworkHandler_antiCheatDisabledMixin", + "PlayerEntity_antiCheatDisabled", "PortalForcer_portalCachingMixin", "PortalBlock_portalCachingMixin",