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

Fix craftbook

Browse Source
This commit is contained in:
Jesse Boyd 2019-12-20 05:54:03 +00:00
parent f37bc9417c
commit c2cc4f5aeb
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
8 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
View File

@ -12,7 +12,6 @@ import com.boydti.fawe.bukkit.listener.CFIPacketListener;
import com.boydti.fawe.bukkit.listener.ChunkListener_8;
import com.boydti.fawe.bukkit.listener.ChunkListener_9;
import com.boydti.fawe.bukkit.listener.RenderListener;
import com.boydti.fawe.bukkit.regions.ASkyBlockHook;
import com.boydti.fawe.bukkit.regions.FactionsUUIDFeature;
import com.boydti.fawe.bukkit.regions.FreeBuildRegion;
import com.boydti.fawe.bukkit.regions.GriefPreventionFeature;

2
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_15/BukkitGetBlocks_1_15.java
View File

@ -80,7 +80,7 @@ public class BukkitGetBlocks_1_15 extends CharGetBlocks {
}
@Override
public CompoundTag getTag(int x, int y, int z) {
public CompoundTag getTile(int x, int y, int z) {
TileEntity tileEntity = getChunk().getTileEntity(new BlockPosition((x & 15) + (X << 4), y, (z & 15) + (Z << 4)));
return new LazyCompoundTag_1_15(Suppliers.memoize(() -> tileEntity.save(new NBTTagCompound())));
}

9
worldedit-core/src/main/java/com/boydti/fawe/beta/IDelegateChunk.java
View File

@ -40,8 +40,8 @@ public interface IDelegateChunk<U extends IQueueChunk> extends IQueueChunk {
}
@Override
default CompoundTag getTag(int x, int y, int z) {
return getParent().getTag(x, y, z);
default CompoundTag getTile(int x, int y, int z) {
return getParent().getTile(x, y, z);
}
@Override
@ -54,11 +54,6 @@ public interface IDelegateChunk<U extends IQueueChunk> extends IQueueChunk {
// getParent().flood(flood, mask, block);
// }
@Override
default CompoundTag getTile(int x, int y, int z) {
return getParent().getTile(x, y, z);
}
@Override
default boolean setTile(int x, int y, int z, CompoundTag tag) {
return getParent().setTile(x, y, z, tag);

6
worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/chunk/ChunkHolder.java
View File

@ -293,12 +293,6 @@ public class ChunkHolder<T extends Future<T>> implements IQueueChunk {
//// block.flood(get, set, mask, block, );
// }
@Override
public CompoundTag getTag(int x, int y, int z) {
return delegate.getFullBlock(this, x, y, z)
.getNbtData(); // TODO NOT IMPLEMENTED (add getTag delegate)
}
@Override
public Map<BlockVector3, CompoundTag> getTiles() {
return delegate.get(this).getTiles();

5
worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/chunk/NullChunk.java
View File

@ -112,11 +112,6 @@ public enum NullChunk implements IQueueChunk {
return BlockTypes.__RESERVED__.getDefaultState().toBaseBlock();
}
@Override
public CompoundTag getTag(int x, int y, int z) {
return null;
}
@Override
public Map<BlockVector3, CompoundTag> getTiles() {
return Collections.emptyMap();

4
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java
View File

@ -346,8 +346,9 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
if (stateString != null) {
state = BlockState.get(state.getBlockType(), "[" + stateString + "]", state);
}
if (context.isPreferringWildcard()) {
if (stateString.isEmpty()) {
if (stateString == null || stateString.isEmpty()) {
state = new FuzzyBlockState(state);
} else {
BlockType type = state.getBlockType();
@ -365,7 +366,6 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
}
}
}
}
// this should be impossible but IntelliJ isn't that smart
if (state == null) {
throw new NoMatchException("Does not match a valid block type: '" + input + "'");

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/CompoundInput.java
View File

@ -7,7 +7,7 @@ public enum CompoundInput {
CONTAINER() {
@Override
public BaseBlock get(BlockState state, ITileInput input, int x, int y, int z) {
return state.toBaseBlock(input.getTag(x, y, z));
return state.toBaseBlock(input.getTile(x, y, z));
}
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/FuzzyBlockState.java
View File

@ -91,7 +91,7 @@ public class FuzzyBlockState extends BlockState {
@Override
public BaseBlock toBaseBlock() {
return new BaseBlock();
return new BaseBlock(this);
}
@Override