Skip to content

Fix paths and farmland not being solid #4915

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

Merged
mdcfe merged 3 commits into from
Jun 18, 2022
Merged

Fix paths and farmland not being solid #4915

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5f4c8d
Fix paths and farmland not being solid
JRoy May 23, 2022
c425b92
Merge branch '2.x' into fix/path-farmland-solid
JRoy Jun 10, 2022
c925af1
Merge branch '2.x' into fix/path-farmland-solid
mdcfe Jun 18, 2022
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
9 changes: 9 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/utils/LocationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ public final class LocationUtil {
"FLOWING_LAVA", "LAVA", "STATIONARY_LAVA");
private static final Material PORTAL = EnumUtil.getMaterial("NETHER_PORTAL", "PORTAL");
private static final Material LIGHT = EnumUtil.getMaterial("LIGHT");

private static final Material PATH = EnumUtil.getMaterial("GRASS_PATH");

private static final Material FARMLAND = EnumUtil.getMaterial("FARMLAND");

// The player can stand inside these materials
private static final Set<Material> HOLLOW_MATERIALS = EnumSet.noneOf(Material.class);
private static final Set<Material> TRANSPARENT_MATERIALS = EnumSet.noneOf(Material.class);
Expand All @@ -49,6 +54,10 @@ public final class LocationUtil {
// Barrier is transparent, but solid
HOLLOW_MATERIALS.remove(Material.BARRIER);

// Path and farmland are transparent, but solid
HOLLOW_MATERIALS.remove(PATH);
HOLLOW_MATERIALS.remove(FARMLAND);

// Light blocks can be passed through and are not considered transparent for some reason
if (LIGHT != null) {
HOLLOW_MATERIALS.add(LIGHT);
Expand Down