From 798e18ecc224ee62653ef8f519b041dd201ce255 Mon Sep 17 00:00:00 2001 From: SirYwell Date: Sat, 5 Jun 2021 20:32:09 +0200 Subject: [PATCH] Look up BlockBase.Info field in actual class instead of subclass --- .../fawe/bukkit/adapter/mc1_16_1/BlockMaterial_1_16_1.java | 2 +- .../fawe/bukkit/adapter/mc1_16_2/BlockMaterial_1_16_2.java | 2 +- .../fawe/bukkit/adapter/mc1_16_5/BlockMaterial_1_16_5.java | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BlockMaterial_1_16_1.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BlockMaterial_1_16_1.java index 4c64a66ff..5c99c6c4c 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BlockMaterial_1_16_1.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BlockMaterial_1_16_1.java @@ -31,7 +31,7 @@ public class BlockMaterial_1_16_1 implements BlockMaterial { this.material = defaultState.getMaterial(); this.craftBlockData = CraftBlockData.fromData(defaultState); this.craftMaterial = craftBlockData.getMaterial(); - BlockBase.Info blockInfo = ReflectionUtil.getField(Block.class, block, "aB"); + BlockBase.Info blockInfo = ReflectionUtil.getField(BlockBase.class, block, "aB"); this.isTranslucent = !(boolean)ReflectionUtil.getField(BlockBase.Info.class, blockInfo, "n"); opacity = defaultState.b(BlockAccessAir.INSTANCE, BlockPosition.ZERO); } diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_2/BlockMaterial_1_16_2.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_2/BlockMaterial_1_16_2.java index 1b72cc954..239d4ed49 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_2/BlockMaterial_1_16_2.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_2/BlockMaterial_1_16_2.java @@ -31,7 +31,7 @@ public class BlockMaterial_1_16_2 implements BlockMaterial { this.material = defaultState.getMaterial(); this.craftBlockData = CraftBlockData.fromData(defaultState); this.craftMaterial = craftBlockData.getMaterial(); - BlockBase.Info blockInfo = ReflectionUtil.getField(Block.class, block, "aB"); + BlockBase.Info blockInfo = ReflectionUtil.getField(BlockBase.class, block, "aB"); this.isTranslucent = !(boolean)ReflectionUtil.getField(BlockBase.Info.class, blockInfo, "n"); opacity = defaultState.b(BlockAccessAir.INSTANCE, BlockPosition.ZERO); } diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_5/BlockMaterial_1_16_5.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_5/BlockMaterial_1_16_5.java index 9be26c788..f57ceeb17 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_5/BlockMaterial_1_16_5.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_5/BlockMaterial_1_16_5.java @@ -12,6 +12,9 @@ import net.minecraft.server.v1_16_R3.ITileEntity; import net.minecraft.server.v1_16_R3.Material; import org.bukkit.craftbukkit.v1_16_R3.block.data.CraftBlockData; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; + public class BlockMaterial_1_16_5 implements BlockMaterial { private final Block block; private final IBlockData defaultState; @@ -31,7 +34,7 @@ public class BlockMaterial_1_16_5 implements BlockMaterial { this.material = defaultState.getMaterial(); this.craftBlockData = CraftBlockData.fromData(defaultState); this.craftMaterial = craftBlockData.getMaterial(); - BlockBase.Info blockInfo = ReflectionUtil.getField(Block.class, block, "aB"); + BlockBase.Info blockInfo = ReflectionUtil.getField(BlockBase.class, block, "aB"); this.isTranslucent = !(boolean)ReflectionUtil.getField(BlockBase.Info.class, blockInfo, "n"); opacity = defaultState.b(BlockAccessAir.INSTANCE, BlockPosition.ZERO); }