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

adds support for Conduit Power

Browse Source 
https://github.com/BentoBoxWorld/AcidIsland/issues/39
This commit is contained in:
tastybento 2019-02-15 08:55:15 -08:00
parent 363e7a2ad4
commit 28ead7494b
1 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@ package world.bentobox.acidisland.listeners;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.List; import java.util.List;
import org.bukkit.GameMode; import org.bukkit.GameMode;
@ -11,7 +10,6 @@ import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -50,7 +48,9 @@ public class AcidEffect implements Listener {
PotionEffectType.SLOW, PotionEffectType.SLOW,
PotionEffectType.SLOW_DIGGING, PotionEffectType.SLOW_DIGGING,
PotionEffectType.WEAKNESS); PotionEffectType.WEAKNESS);
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> DRY_BIOMES = Arrays.asList(
Biome.BADLANDS, Biome.BADLANDS,
Biome.BADLANDS_PLATEAU, Biome.BADLANDS_PLATEAU,
@ -192,16 +192,10 @@ public class AcidEffect implements Listener {
private boolean isSafeFromRain(Player player) { private boolean isSafeFromRain(Player player) {
if (addon.getSettings().isHelmetProtection() && (player.getInventory().getHelmet() != null if (addon.getSettings().isHelmetProtection() && (player.getInventory().getHelmet() != null
&& player.getInventory().getHelmet().getType().name().contains("HELMET")) && player.getInventory().getHelmet().getType().name().contains("HELMET"))
|| (DRY_BIOMES.contains(player.getLocation().getBlock().getBiome()))) { || (DRY_BIOMES.contains(player.getLocation().getBlock().getBiome()))
|| (player.getActivePotionEffects().stream().map(PotionEffect::getType).anyMatch(IMMUNE_EFFECTS::contains))) {
return true; return true;
} }
// Check potions
for (PotionEffect s : player.getActivePotionEffects()) {
if (s.getType().equals(PotionEffectType.WATER_BREATHING)) {
// Safe!
return true;
}
}
// Check if all air above player // Check if all air above player
for (int y = player.getLocation().getBlockY() + 2; y < player.getLocation().getWorld().getMaxHeight(); y++) { for (int y = player.getLocation().getBlockY() + 2; y < player.getLocation().getWorld().getMaxHeight(); y++) {
if (!player.getLocation().getWorld().getBlockAt(player.getLocation().getBlockX(), y, player.getLocation().getBlockZ()).getType().equals(Material.AIR)) { if (!player.getLocation().getWorld().getBlockAt(player.getLocation().getBlockX(), y, player.getLocation().getBlockZ()).getType().equals(Material.AIR)) {
@ -214,48 +208,26 @@ public class AcidEffect implements Listener {
/** /**
* Check if player can be burned by acid * Check if player can be burned by acid
* @param player - player * @param player - player
* @return true if player is not safe * @return true if player is safe
*/ */
private boolean isSafeFromAcid(Player player) { private boolean isSafeFromAcid(Player player) {
// In liquid // In liquid
Material bodyMat = player.getLocation().getBlock().getType(); if (!player.getLocation().getBlock().getType().equals(Material.WATER)
Material headMat = player.getLocation().getBlock().getRelative(BlockFace.UP).getType(); && !player.getLocation().getBlock().getRelative(BlockFace.UP).getType().equals(Material.WATER)) {
// TODO: remove backwards compatibility hack
if (bodyMat.name().contains("WATER"))
bodyMat = Material.WATER;
if (headMat.name().contains("WATER"))
headMat = Material.WATER;
if (bodyMat != Material.WATER && headMat != Material.WATER) {
return true; return true;
} }
// Check if player is in a boat // Check if player is in a boat
Entity playersVehicle = player.getVehicle(); if (player.getVehicle() != null && player.getVehicle().getType().equals(EntityType.BOAT)) {
if (playersVehicle != null && playersVehicle.getType().equals(EntityType.BOAT)) { // I'M ON A BOAT! I'M ON A BOAT! A %^&&* BOAT! SNL Sketch.
// I'M ON A BOAT! I'M ON A BOAT! A %^&&* BOAT!
return true; return true;
} }
// Check if full armor protects // Check if full armor protects
if (addon.getSettings().isFullArmorProtection()) { if (addon.getSettings().isFullArmorProtection()
boolean fullArmor = true; && Arrays.stream(player.getInventory().getArmorContents()).allMatch(i -> i != null && !i.getType().equals(Material.AIR))) {
for (ItemStack item : player.getInventory().getArmorContents()) { return true;
if (item == null || item.getType().equals(Material.AIR)) {
fullArmor = false;
break;
}
}
if (fullArmor) {
return true;
}
} }
// Check if player has an active water potion or not // Check if player has an active water potion or not
Collection<PotionEffect> activePotions = player.getActivePotionEffects(); return player.getActivePotionEffects().stream().map(PotionEffect::getType).anyMatch(IMMUNE_EFFECTS::contains);
for (PotionEffect s : activePotions) {
if (s.getType().equals(PotionEffectType.WATER_BREATHING)) {
// Safe!
return true;
}
}
return false;
} }
/** /**