Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-05 20:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove stub injector methods

Browse Source
This commit is contained in:
Jesse Boyd
2018-08-13 02:36:39 +10:00
parent fa06ff357e
commit e7c27b08bf
124 changed files with 241 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
View File

@ -127,13 +127,13 @@ public class NullWorld extends AbstractWorld {
}
@Override
public LazyBlock getLazyBlock(Vector position) {
return new LazyBlock(getBlock(position), this, position);
public BlockState getLazyBlock(Vector position) {
return getBlock(position);
}
@Override
public BaseBlock getFullBlock(Vector position) {
return new BaseBlock(getBlock(position));
public BlockState getFullBlock(Vector position) {
return getBlock(position);
}
@Override

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BaseBiome.java
View File

@ -86,7 +86,5 @@ public class BaseBiome {
}
public static Class<?> inject() {
return BaseBiome.class;
}
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/Chunk.java
View File

@ -36,6 +36,6 @@ public interface Chunk {
* @return block the block
* @throws DataException thrown on data error
*/
BaseBlock getBlock(Vector position) throws DataException;
BlockState getBlock(Vector position) throws DataException;
}

12
worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/OldChunk.java
View File

@ -155,8 +155,8 @@ public class OldChunk implements Chunk {
}
@Override
public BaseBlock getBlock(Vector position) throws DataException {
if(position.getBlockY() >= 128) new BaseBlock(BlockTypes.AIR);
public BlockState getBlock(Vector position) throws DataException {
if(position.getBlockY() >= 128) return BlockTypes.AIR.getDefaultState();
int id, dataVal;
int x = position.getBlockX() - rootX * 16;
@ -183,9 +183,11 @@ public class OldChunk implements Chunk {
}
BlockState state = LegacyMapper.getInstance().getBlockFromLegacy(id, dataVal);
CompoundTag tileEntity = getBlockTileEntity(position);
return new BaseBlock(state, tileEntity);
if (state.getBlockType().getMaterial().hasContainer()) {
CompoundTag tileEntity = getBlockTileEntity(position);
if (tileEntity != null) return new BaseBlock(state, tileEntity);
}
return state;
}
}