Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cherry pick: * Move to more maintainable PotionEffectTypeCategory for potion handling

Browse Source
This commit is contained in:
Len 2024-07-20 17:08:31 +02:00
parent 6f2a02d610
commit 40152b5dd9
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
View File

@ -96,6 +96,7 @@ import org.bukkit.metadata.MetadataValue;
import org.bukkit.persistence.PersistentDataType; import org.bukkit.persistence.PersistentDataType;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import org.bukkit.potion.PotionEffectTypeCategory;
import org.bukkit.projectiles.BlockProjectileSource; import org.bukkit.projectiles.BlockProjectileSource;
import org.bukkit.projectiles.ProjectileSource; import org.bukkit.projectiles.ProjectileSource;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -1456,7 +1457,7 @@ public class EntityEventHandler implements Listener
if (thrower == null) return; if (thrower == null) return;
//otherwise, no restrictions for positive effects //otherwise, no restrictions for positive effects
if (positiveEffects.contains(effectType)) continue; if (effectType.getCategory() == PotionEffectTypeCategory.BENEFICIAL) continue;
for (LivingEntity effected : event.getAffectedEntities()) for (LivingEntity effected : event.getAffectedEntities())
{ {
@ -1577,22 +1578,4 @@ public class EntityEventHandler implements Listener
} }
} }
public static final HashSet<PotionEffectType> positiveEffects = new HashSet<>(Arrays.asList
(
PotionEffectType.ABSORPTION,
PotionEffectType.RESISTANCE,
PotionEffectType.HASTE,
PotionEffectType.FIRE_RESISTANCE,
PotionEffectType.REGENERATION,
PotionEffectType.HEALTH_BOOST,
PotionEffectType.STRENGTH,
PotionEffectType.INVISIBILITY,
PotionEffectType.JUMP_BOOST,
PotionEffectType.NIGHT_VISION,
PotionEffectType.REGENERATION,
PotionEffectType.SATURATION,
PotionEffectType.SPEED,
PotionEffectType.WATER_BREATHING
));
} }