Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-01 06:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delegate to blocktype for obtaining a BlockState's material

Browse Source
This commit is contained in:
dordsor21 2021-01-14 12:45:11 +00:00
parent ac73478827
commit 5e1289494e
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -26,10 +26,8 @@ import com.boydti.fawe.util.StringMan;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.NullExtent; import com.sk89q.worldedit.extent.NullExtent;
import com.sk89q.worldedit.extent.OutputExtent; import com.sk89q.worldedit.extent.OutputExtent;
@ -58,7 +56,6 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
private final int ordinal; private final int ordinal;
private final char ordinalChar; private final char ordinalChar;
private final BlockType blockType; private final BlockType blockType;
private BlockMaterial material;
private final BaseBlock emptyBaseBlock; private final BaseBlock emptyBaseBlock;
private CompoundInput compoundInput = CompoundInput.NULL; private CompoundInput compoundInput = CompoundInput.NULL;
@ -75,7 +72,6 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
* @deprecated Magic Numbers * @deprecated Magic Numbers
* @return BlockState * @return BlockState
*/ */
@Deprecated @Deprecated
public static BlockState getFromInternalId(int combinedId) throws InputParseException { public static BlockState getFromInternalId(int combinedId) throws InputParseException {
return BlockTypes.getFromStateId(combinedId).withStateId(combinedId); return BlockTypes.getFromStateId(combinedId).withStateId(combinedId);
@ -366,16 +362,7 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
@Override @Override
public BlockMaterial getMaterial() { public BlockMaterial getMaterial() {
if (this.material == null) { return blockType.getMaterial();
if (blockType == BlockTypes.__RESERVED__) {
return this.material = blockType.getMaterial();
}
this.material = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS).getRegistries().getBlockRegistry().getMaterial(this);
if (this.material.hasContainer()) {
this.compoundInput = CompoundInput.CONTAINER;
}
}
return material;
} }
@Override @Override
@ -408,11 +395,7 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
} }
public boolean isAir() { public boolean isAir() {
try { return blockType.getMaterial().isAir();
return material.isAir();
} catch (NullPointerException ignored) {
return getMaterial().isAir();
}
} }
@Override @Override