Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent unhinged tree generation by doing a sanity check on the block below/block of the tree placement #1811

Merged
merged 1 commit into from
Jun 16, 2022
Merged

Prevent unhinged tree generation by doing a sanity check on the block below/block of the tree placement #1811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 80 additions & 8 deletions worldedit-core/src/main/java/com/sk89q/worldedit/util/TreeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;

import javax.annotation.Nullable;
Expand Down Expand Up @@ -80,10 +81,44 @@ public boolean generate(EditSession editSession, BlockVector3 pos) throws MaxCha
}
},
JUNGLE_BUSH("Jungle bush", "junglebush", "jungleshrub"),
RED_MUSHROOM("Red mushroom", "redmushroom", "redgiantmushroom"),
BROWN_MUSHROOM("Brown mushroom", "brownmushroom", "browngiantmushroom"),
CRIMSON_FUNGUS("Crimson fungus", "crimsonfungus", "rednethermushroom"),
WARPED_FUNGUS("Warped fungus", "warpedfungus", "greennethermushroom"),
//FAWE start - perform sanity check on generation location
RED_MUSHROOM("Red mushroom", "redmushroom", "redgiantmushroom"){
@Override
public boolean canGenerateOn(final BlockType type) {
return type == BlockTypes.MYCELIUM
|| type == BlockTypes.WARPED_NYLIUM
|| type == BlockTypes.CRIMSON_NYLIUM
|| super.canGenerateOn(type);
}
},
BROWN_MUSHROOM("Brown mushroom", "brownmushroom", "browngiantmushroom"){
@Override
public boolean canGenerateOn(final BlockType type) {
return type == BlockTypes.MYCELIUM
|| type == BlockTypes.WARPED_NYLIUM
|| type == BlockTypes.CRIMSON_NYLIUM
|| super.canGenerateOn(type);
}
},
CRIMSON_FUNGUS("Crimson fungus", "crimsonfungus", "rednethermushroom"){
@Override
public boolean canGenerateOn(final BlockType type) {
return type == BlockTypes.MYCELIUM
|| type == BlockTypes.WARPED_NYLIUM
|| type == BlockTypes.CRIMSON_NYLIUM
|| super.canGenerateOn(type);
}
},
WARPED_FUNGUS("Warped fungus", "warpedfungus", "greennethermushroom") {
@Override
public boolean canGenerateOn(final BlockType type) {
return type == BlockTypes.MYCELIUM
|| type == BlockTypes.WARPED_NYLIUM
|| type == BlockTypes.CRIMSON_NYLIUM
|| super.canGenerateOn(type);
}
},
//FAWE end
RANDOM_MUSHROOM("Random mushroom", "randmushroom", "randommushroom") {
@Override
public boolean generate(EditSession editSession, BlockVector3 pos) throws MaxChangedBlocksException {
Expand All @@ -98,16 +133,33 @@ public boolean generate(EditSession editSession, BlockVector3 pos) throws MaxCha
PINE("Pine tree", "pine") {
@Override
public boolean generate(EditSession editSession, BlockVector3 pos) throws MaxChangedBlocksException {
makePineTree(editSession, pos);
return true;
//FAWE start - perform sanity check on generation location
if (editSession
.getBlockType(pos.getX(), pos.getY(), pos.getZ())
.getMaterial()
.isAir() && canGenerateOn(editSession.getBlockType(pos.getX(), pos.getY() - 1, pos.getZ()))) {
makePineTree(editSession, pos);
return true;
}
return false;
//FAWE end
}
},
CHORUS_PLANT("Chorus plant", "chorusplant") {
@Override
public boolean generate(EditSession editSession, BlockVector3 pos) throws MaxChangedBlocksException {
//FAWE start - ensure canGenerateOn is called.
// chorus plants have to generate starting in the end stone itself, not the air above the ground
return editSession.getWorld().generateTree(this, editSession, pos.subtract(0, 1, 0));
return super.generate(editSession, pos.subtract(0, 1, 0));
//FAWE end
}

//FAWE start - perform sanity check on generation location
@Override
public boolean canGenerateOn(BlockType type) {
return type == BlockTypes.END_STONE;
}
//FAWE end
},
RANDOM("Random tree", "rand", "random") {
@Override
Expand Down Expand Up @@ -151,8 +203,28 @@ public static Set<String> getPrimaryAliases() {
}

public boolean generate(EditSession editSession, BlockVector3 pos) throws MaxChangedBlocksException {
return editSession.getWorld().generateTree(this, editSession, pos);
//FAWE start - check for ability for tree to generate on block
if (editSession
.getBlockType(pos.getX(), pos.getY(), pos.getZ())
.getMaterial()
.isAir() && canGenerateOn(editSession.getBlockType(pos.getX(), pos.getY() - 1, pos.getZ()))) {
return editSession.getWorld().generateTree(this, editSession, pos);
}
return false;
//FAWE end
}

//FAWE start - check for ability for tree to generate on block
public boolean canGenerateOn(BlockType type) {
NotMyFault marked this conversation as resolved.
Show resolved Hide resolved
return type == BlockTypes.DIRT
|| type == BlockTypes.GRASS_BLOCK
|| type == BlockTypes.PODZOL
|| type == BlockTypes.COARSE_DIRT
|| type == BlockTypes.MOSS_BLOCK
|| type == BlockTypes.ROOTED_DIRT
|| type == BlockTypes.MUD;
}
//FAWE end

/**
* Get user-friendly tree type name.
Expand Down