From f38fc342ce53fa6cfb14a487c4c77a4b927cb7aa Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sat, 29 Aug 2020 13:48:40 +0800 Subject: [PATCH] More backport fixes. --- .../mixin/core/enchantment/FrostWalkerEnchantmentMixin.java | 1 - .../core/server/management/PlayerInteractionManagerMixin.java | 4 ++-- .../common/mixin/core/server/management/PlayerListMixin.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java index 8824ee957..281ad6ed5 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/enchantment/FrostWalkerEnchantmentMixin.java @@ -39,7 +39,6 @@ public static void freezeNearby(LivingEntity living, World worldIn, BlockPos pos BlockState blockstate2 = worldIn.getBlockState(blockpos); boolean isFull = blockstate2.getBlock() == Blocks.WATER && blockstate2.get(FlowingFluidBlock.LEVEL) == 0; //TODO: Forge, modded waters? if (blockstate2.getMaterial() == Material.WATER && isFull && blockstate.isValidPosition(worldIn, blockpos) && worldIn.func_226663_a_(blockstate, blockpos, ISelectionContext.dummy()) && !ForgeEventFactory.onBlockPlace(living, new BlockSnapshot(worldIn, blockpos, blockstate2), Direction.UP)) { - worldIn.setBlockState(blockpos, blockstate); if (CraftEventFactory.handleBlockFormEvent(worldIn, blockpos, blockstate, living)) { worldIn.getPendingBlockTicks().scheduleTick(blockpos, Blocks.FROSTED_ICE, MathHelper.nextInt(living.getRNG(), 60, 120)); } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerInteractionManagerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerInteractionManagerMixin.java index efcbea806..4f7b1b7c1 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerInteractionManagerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerInteractionManagerMixin.java @@ -133,7 +133,7 @@ public void func_225416_a(BlockPos blockPos, CPlayerDiggingPacket.Action action, } else if (data.getBlock() instanceof TrapDoorBlock) { this.player.connection.sendPacket(new SChangeBlockPacket(this.world, blockPos)); } - } else if (!iblockdata.isAir()) { + } else if (!iblockdata.isAir(world, blockPos)) { if (forgeEvent.getUseBlock() != net.minecraftforge.eventbus.api.Event.Result.DENY) { iblockdata.onBlockClicked(this.world, blockPos, this.player); } @@ -154,7 +154,7 @@ public void func_225416_a(BlockPos blockPos, CPlayerDiggingPacket.Action action, if (blockEvent.getInstaBreak()) { f = 2.0f; } - if (!iblockdata.isAir() && f >= 1.0f) { + if (!iblockdata.isAir(world, blockPos) && f >= 1.0f) { this.func_229860_a_(blockPos, action, "insta mine"); } else { if (this.isDestroyingBlock) { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java index 17a11ded3..cd1f188bb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java @@ -421,7 +421,7 @@ else if (!world.getDimension().canRespawnHere()) serverplayerentity.setPositionAndRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); serverplayerentity.connection.captureCurrentPosition(); - this.setPlayerGameTypeBasedOnOther(serverplayerentity, playerIn, serverworld); + // this.setPlayerGameTypeBasedOnOther(serverplayerentity, playerIn, serverworld); while (avoidSuffocation && !serverworld.hasNoCollisions(serverplayerentity) && serverplayerentity.posY < 256.0D) { serverplayerentity.setPosition(serverplayerentity.posX, serverplayerentity.posY + 1.0D, serverplayerentity.posZ); @@ -459,7 +459,6 @@ else if (!world.getDimension().canRespawnHere()) } BasicEventHooks.firePlayerRespawnEvent(serverplayerentity, conqueredEnd); - System.out.println("pos " + serverplayerentity.getBedLocation()); return serverplayerentity; }