Upstream/AcidIsland
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/AcidIsland.git synced 2025-02-25 00:31:36 +01:00
Code Issues Projects Releases Wiki Activity

Snow will not be like acid rain

Browse Source 
https://github.com/BentoBoxWorld/AcidIsland/issues/38
This commit is contained in:
tastybento 2019-02-16 11:45:30 -08:00
parent 28ead7494b
commit 07ef606eda
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
View File

@ -51,7 +51,8 @@ public class AcidEffect implements Listener {
private static final List<PotionEffectType> IMMUNE_EFFECTS = Arrays.asList(
PotionEffectType.WATER_BREATHING,
PotionEffectType.CONDUIT_POWER);
private static final List<Biome> DRY_BIOMES = Arrays.asList(
private static final List<Biome> NO_ACID_RAIN_BIOMES = Arrays.asList(
// Dry biomes
Biome.BADLANDS,
Biome.BADLANDS_PLATEAU,
Biome.DESERT,
@ -71,7 +72,19 @@ public class AcidEffect implements Listener {
Biome.SMALL_END_ISLANDS,
Biome.THE_END,
Biome.THE_VOID,
Biome.WOODED_BADLANDS_PLATEAU);
Biome.WOODED_BADLANDS_PLATEAU,
// Cold biomes - snow doesn't burn either
Biome.MOUNTAINS,
Biome.GRAVELLY_MOUNTAINS,
Biome.MODIFIED_GRAVELLY_MOUNTAINS,
Biome.WOODED_MOUNTAINS,
Biome.TAIGA,
Biome.TAIGA_MOUNTAINS,
Biome.TAIGA_HILLS,
Biome.GIANT_SPRUCE_TAIGA,
Biome.GIANT_SPRUCE_TAIGA_HILLS,
Biome.STONE_SHORE
);
public AcidEffect(AcidIsland addon) {
this.addon = addon;
@ -192,7 +205,7 @@ public class AcidEffect implements Listener {
private boolean isSafeFromRain(Player player) {
if (addon.getSettings().isHelmetProtection() && (player.getInventory().getHelmet() != null
&& player.getInventory().getHelmet().getType().name().contains("HELMET"))
|| (DRY_BIOMES.contains(player.getLocation().getBlock().getBiome()))
|| (NO_ACID_RAIN_BIOMES.contains(player.getLocation().getBlock().getBiome()))
|| (player.getActivePotionEffects().stream().map(PotionEffect::getType).anyMatch(IMMUNE_EFFECTS::contains))) {
return true;
}