Fix CFI generation

This commit is contained in:
Jesse Boyd
2019-11-08 22:30:39 +00:00
parent 26f073faa2
commit d61dac5aa5
10 changed files with 106 additions and 107 deletions

View File

@ -15,6 +15,7 @@ public class BlockMaterial_1_14 implements BlockMaterial {
private final Material material;
private final boolean isTranslucent;
private final CraftBlockData craftBlockData;
private final org.bukkit.Material craftMaterial;
public BlockMaterial_1_14(Block block) {
this(block, block.getBlockData());
@ -25,6 +26,7 @@ public class BlockMaterial_1_14 implements BlockMaterial {
this.defaultState = defaultState;
this.material = defaultState.getMaterial();
this.craftBlockData = CraftBlockData.fromData(defaultState);
this.craftMaterial = craftBlockData.getMaterial();
this.isTranslucent = ReflectionUtil.getField(Block.class, block, "v");
}
@ -51,7 +53,7 @@ public class BlockMaterial_1_14 implements BlockMaterial {
@Override
public boolean isFullCube() {
return defaultState.g();
return craftMaterial.isOccluding();
}
@Override

View File

@ -276,9 +276,6 @@ public class BukkitPlayer extends AbstractPlayerActor {
Player tmp = Bukkit.getPlayer(getUniqueId());
if (tmp != null) {
player = tmp;
} else {
System.out.println("Invalid player " + player.getName());
new Exception().printStackTrace();
}
}
return player;