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

Separated out fluids and blocks - they're different now

Browse Source
This commit is contained in:
Matthew Miller
2018-06-19 15:50:31 +10:00
parent 70aceb3837
commit 416480c16d
15 changed files with 836 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -23,6 +23,7 @@ import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.blocks.BlockType;
import com.sk89q.worldedit.blocks.LazyBlock;
import com.sk89q.worldedit.blocks.type.BlockCategories;
import com.sk89q.worldedit.blocks.type.BlockState;
import com.sk89q.worldedit.blocks.type.BlockStateHolder;
import com.sk89q.worldedit.blocks.type.BlockTypes;
@ -1445,7 +1446,7 @@ public class EditSession implements Extent {
for (int y = world.getMaxY(); y >= 1; --y) {
Vector pt = new Vector(x, y, z);
com.sk89q.worldedit.blocks.type.BlockType id = getLazyBlock(pt).getBlockType();
com.sk89q.worldedit.blocks.type.BlockType id = getBlock(pt).getBlockType();
if (id == BlockTypes.ICE) {
if (setBlock(pt, water)) {
@ -1495,14 +1496,14 @@ public class EditSession implements Extent {
for (int y = world.getMaxY(); y >= 1; --y) {
Vector pt = new Vector(x, y, z);
int id = getLazyBlock(pt).getId();
com.sk89q.worldedit.blocks.type.BlockType id = getBlock(pt).getBlockType();
if (id == BlockID.AIR) {
if (id == BlockTypes.AIR) {
continue;
}
// Ice!
if (id == BlockID.WATER || id == BlockID.STATIONARY_WATER) {
if (id == BlockTypes.WATER) {
if (setBlock(pt, ice)) {
++affected;
}
@ -1510,9 +1511,9 @@ public class EditSession implements Extent {
}
// Snow should not cover these blocks
if (BlockType.isTranslucent(id)) {
if (BlockType.isTranslucent(id.getLegacyId())) {
// Add snow on leaves
if (id != BlockID.LEAVES && id != BlockID.LEAVES2) {
if (BlockCategories.LEAVES.contains(id)) {
break;
}
}