Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-03 15:08:18 +01:00
Code Issues Projects Releases Wiki Activity

Fix barrier considered as unsafe block to teleport (#4348)

Browse Source 
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
This commit is contained in:
Daniil Z 2021-08-02 17:22:07 +03:00 committed by GitHub
parent aaddb2af1f
commit e95df57642
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Essentials/src/main/java/com/earth2me/essentials/utils/LocationUtil.java
View File

@ -12,7 +12,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -31,8 +31,8 @@ public final class LocationUtil {
"FLOWING_LAVA", "LAVA", "STATIONARY_LAVA"); "FLOWING_LAVA", "LAVA", "STATIONARY_LAVA");
private static final Material PORTAL = EnumUtil.getMaterial("NETHER_PORTAL", "PORTAL"); private static final Material PORTAL = EnumUtil.getMaterial("NETHER_PORTAL", "PORTAL");
// The player can stand inside these materials // The player can stand inside these materials
private static final Set<Material> HOLLOW_MATERIALS = new HashSet<>(); private static final Set<Material> HOLLOW_MATERIALS = EnumSet.noneOf(Material.class);
private static final Set<Material> TRANSPARENT_MATERIALS = new HashSet<>(); private static final Set<Material> TRANSPARENT_MATERIALS = EnumSet.noneOf(Material.class);
static { static {
// Materials from Material.isTransparent() // Materials from Material.isTransparent()
@ -44,6 +44,9 @@ public final class LocationUtil {
TRANSPARENT_MATERIALS.addAll(HOLLOW_MATERIALS); TRANSPARENT_MATERIALS.addAll(HOLLOW_MATERIALS);
TRANSPARENT_MATERIALS.addAll(WATER_TYPES); TRANSPARENT_MATERIALS.addAll(WATER_TYPES);
// Barrier is transparent, but solid
HOLLOW_MATERIALS.remove(Material.BARRIER);
} }
static { static {