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

Start work on the new BaseBlock/BlockState split

Browse Source
This commit is contained in:
Matthew Miller
2018-06-17 15:42:47 +10:00
parent aaaf2d5678
commit c43109bde5
20 changed files with 273 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,7 +180,7 @@ public abstract class AbstractWorld implements World {
}
@Override
public boolean queueBlockBreakEffect(Platform server, Vector position, int blockId, double priority) {
public boolean queueBlockBreakEffect(Platform server, Vector position, com.sk89q.worldedit.blocks.type.BlockType blockType, double priority) {
if (taskId == -1) {
taskId = server.schedule(0, 1, () -> {
int max = Math.max(1, Math.min(30, effectQueue.size() / 3));
@ -196,7 +196,7 @@ public abstract class AbstractWorld implements World {
return false;
}
effectQueue.offer(new QueuedEffect(position, blockId, priority));
effectQueue.offer(new QueuedEffect(position, blockType, priority));
return true;
}
@ -218,17 +218,17 @@ public abstract class AbstractWorld implements World {
private class QueuedEffect implements Comparable<QueuedEffect> {
private final Vector position;
private final int blockId;
private final com.sk89q.worldedit.blocks.type.BlockType blockType;
private final double priority;
private QueuedEffect(Vector position, int blockId, double priority) {
private QueuedEffect(Vector position, com.sk89q.worldedit.blocks.type.BlockType blockType, double priority) {
this.position = position;
this.blockId = blockId;
this.blockType = blockType;
this.priority = priority;
}
public void play() {
playEffect(position, 2001, blockId);
playEffect(position, 2001, blockType.getLegacyId());
}
@Override