Upstream
/
WorldGuard
mirror of https://github.com/EngineHub/WorldGuard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tidy up Materials.java, added missing effect type, removed todo for paper only

This commit is contained in:
JOO200 2022-06-11 21:04:55 +02:00 committed by wizjany
parent 857f7468d8
commit 3a181a230f
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java
View File

@ -794,7 +794,7 @@ public final class Materials {
MATERIAL_FLAGS.put(Material.HANGING_ROOTS, 0);
MATERIAL_FLAGS.put(Material.POINTED_DRIPSTONE, 0);
// 1.19 TODO: Check for Modifications
// 1.19
MATERIAL_FLAGS.put(Material.MUD, 0);
MATERIAL_FLAGS.put(Material.MANGROVE_ROOTS, 0);
MATERIAL_FLAGS.put(Material.MUDDY_MANGROVE_ROOTS, 0);
@ -941,7 +941,7 @@ public final class Materials {
MATERIAL_FLAGS.put(material, 0);
}
if (!MATERIAL_FLAGS.containsKey(material)) {
logger.info("Missing material definition for " + (material.isBlock() ? "block " : "item ") + material.name());
logger.fine("Missing material definition for " + (material.isBlock() ? "block " : "item ") + material.name());
}
}
@ -977,6 +977,7 @@ public final class Materials {
// DAMAGE_EFFECTS.add(PotionEffectType.DOLPHINS_GRACE);
DAMAGE_EFFECTS.add(PotionEffectType.BAD_OMEN);
// DAMAGE_EFFECTS.add(PotionEffectType.HERO_OF_THE_VILLAGE);
DAMAGE_EFFECTS.add(PotionEffectType.DARKNESS);
}
private Materials() {
@ -1465,11 +1466,6 @@ public final class Materials {
*/
public static boolean hasDamageEffect(Collection<PotionEffect> effects) {
for (PotionEffect effect : effects) {
/* TODO: Replace DAMAGE_EFFECTS with paper:
if (effect.getType().getEffectCategory() == PotionEffectType.Category.HARMFUL) {
return true;
}
*/
if (DAMAGE_EFFECTS.contains(effect.getType())) {
return true;
}