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

Copy paste/merge FAWE classes to this WorldEdit fork

Browse Source 
- so certain people can look at the diff and complain about my sloppy code :(

Signed-off-by: Jesse Boyd <jessepaleg@gmail.com>
This commit is contained in:
Jesse Boyd
2018-08-13 00:03:07 +10:00
parent a920c77cb8
commit a629d15c74
994 changed files with 117583 additions and 10745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,20 +22,23 @@ package com.sk89q.worldedit.world;
import com.sk89q.worldedit.BlockVector2D;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.extension.platform.Platform;
import com.sk89q.worldedit.function.mask.BlockMask;
import com.sk89q.worldedit.function.mask.BlockTypeMask;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.util.Direction;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.PriorityQueue;
import javax.annotation.Nullable;
import java.util.PriorityQueue;
/**
* An abstract implementation of {@link World}.
@ -62,9 +65,7 @@ public abstract class AbstractWorld implements World {
@Override
public Mask createLiquidMask() {
return new BlockMask(this,
BlockTypes.LAVA.getDefaultState().toFuzzy(),
BlockTypes.WATER.getDefaultState().toFuzzy());
return new BlockTypeMask(this, BlockTypes.LAVA, BlockTypes.WATER);
}
@Override
@ -91,6 +92,11 @@ public abstract class AbstractWorld implements World {
return false;
}
@Override
public BlockState getLazyBlock(Vector position) {
return new BaseBlock(getBlock(position));
}
@Override
public boolean queueBlockBreakEffect(Platform server, Vector position, BlockType blockType, double priority) {
if (taskId == -1) {
@ -140,7 +146,7 @@ public abstract class AbstractWorld implements World {
}
public void play() {
playEffect(position, 2001, blockType.getLegacyId());
playEffect(position, 2001, blockType.getLegacyCombinedId() >> 4);
}
@Override
@ -148,5 +154,4 @@ public abstract class AbstractWorld implements World {
return Double.compare(priority, other != null ? other.priority : 0);
}
}
}
}