mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-25 00:25:27 +02:00
Compare commits
3 Commits
chore/3765
...
fix/3725
Author | SHA1 | Date | |
---|---|---|---|
![]() |
10d140b33c | ||
![]() |
98ee2d162b | ||
![]() |
62fac61c4d |
@@ -109,8 +109,6 @@ import java.util.List;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
public class BlockEventListener implements Listener {
|
public class BlockEventListener implements Listener {
|
||||||
@@ -123,11 +121,6 @@ public class BlockEventListener implements Listener {
|
|||||||
Material.TURTLE_EGG,
|
Material.TURTLE_EGG,
|
||||||
Material.TURTLE_SPAWN_EGG
|
Material.TURTLE_SPAWN_EGG
|
||||||
);
|
);
|
||||||
private static final Set<Material> SNOW = Stream.of(Material.values()) // needed as Tag.SNOW isn't present in 1.16.5
|
|
||||||
.filter(material -> material.name().contains("SNOW"))
|
|
||||||
.filter(Material::isBlock)
|
|
||||||
.collect(Collectors.toUnmodifiableSet());
|
|
||||||
|
|
||||||
private final PlotAreaManager plotAreaManager;
|
private final PlotAreaManager plotAreaManager;
|
||||||
private final WorldEdit worldEdit;
|
private final WorldEdit worldEdit;
|
||||||
|
|
||||||
@@ -536,7 +529,7 @@ public class BlockEventListener implements Listener {
|
|||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (SNOW.contains(event.getNewState().getType())) {
|
if (Tag.SNOW.isTagged(event.getNewState().getType())) {
|
||||||
if (!plot.getFlag(SnowFormFlag.class)) {
|
if (!plot.getFlag(SnowFormFlag.class)) {
|
||||||
plot.debug("Snow could not form because snow-form = false");
|
plot.debug("Snow could not form because snow-form = false");
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
@@ -568,7 +561,7 @@ public class BlockEventListener implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Class<? extends BooleanFlag<?>> flag;
|
Class<? extends BooleanFlag<?>> flag;
|
||||||
if (SNOW.contains(event.getNewState().getType())) {
|
if (Tag.SNOW.isTagged(event.getNewState().getType())) {
|
||||||
flag = SnowFormFlag.class;
|
flag = SnowFormFlag.class;
|
||||||
} else if (Tag.ICE.isTagged(event.getNewState().getType())) {
|
} else if (Tag.ICE.isTagged(event.getNewState().getType())) {
|
||||||
flag = IceFormFlag.class;
|
flag = IceFormFlag.class;
|
||||||
@@ -685,7 +678,7 @@ public class BlockEventListener implements Listener {
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (SNOW.contains(blockType)) {
|
if (Tag.SNOW.isTagged(blockType)) {
|
||||||
if (!plot.getFlag(SnowMeltFlag.class)) {
|
if (!plot.getFlag(SnowMeltFlag.class)) {
|
||||||
plot.debug("Snow could not melt because snow-melt = false");
|
plot.debug("Snow could not melt because snow-melt = false");
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
@@ -19,7 +19,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.plotsquared"
|
group = "com.plotsquared"
|
||||||
version = "6.9.5-SNAPSHOT"
|
version = "6.9.4-SNAPSHOT"
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
group = rootProject.group
|
group = rootProject.group
|
||||||
@@ -65,7 +65,7 @@ subprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.13"))
|
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.12"))
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@@ -8,7 +8,7 @@ spotbugs = "4.7.1"
|
|||||||
worldedit = "7.2.12"
|
worldedit = "7.2.12"
|
||||||
placeholderapi = "2.11.2"
|
placeholderapi = "2.11.2"
|
||||||
luckperms = "5.4"
|
luckperms = "5.4"
|
||||||
essentialsx = "2.19.5"
|
essentialsx = "2.19.4"
|
||||||
mvdwapi = "3.1.1"
|
mvdwapi = "3.1.1"
|
||||||
|
|
||||||
# Third party
|
# Third party
|
||||||
|
Reference in New Issue
Block a user