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

Adds Polar Bear to immune list

Browse Source 
https://github.com/BentoBoxWorld/AcidIsland/issues/36
This commit is contained in:
tastybento 2019-02-12 23:21:48 -08:00
parent 69f7d2c816
commit 912221004b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/world/bentobox/acidisland/world/AcidTask.java
View File

@ -1,7 +1,9 @@
package world.bentobox.acidisland.world; package world.bentobox.acidisland.world;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -11,20 +13,18 @@ import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.entity.Animals; import org.bukkit.entity.Animals;
import org.bukkit.entity.Drowned;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Guardian;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.MagmaCube; import org.bukkit.entity.MagmaCube;
import org.bukkit.entity.Monster; import org.bukkit.entity.Monster;
import org.bukkit.entity.Squid;
import org.bukkit.entity.Turtle;
import world.bentobox.acidisland.AcidIsland; import world.bentobox.acidisland.AcidIsland;
public class AcidTask { public class AcidTask {
private final AcidIsland addon; private final AcidIsland addon;
private static final List<EntityType> IMMUNE = Arrays.asList(EntityType.GUARDIAN, EntityType.ELDER_GUARDIAN,
EntityType.SQUID, EntityType.TURTLE, EntityType.POLAR_BEAR, EntityType.DROWNED);
private Set<Entity> itemsInWater = Collections.newSetFromMap(new WeakHashMap<Entity, Boolean>()); private Set<Entity> itemsInWater = Collections.newSetFromMap(new WeakHashMap<Entity, Boolean>());
private int entityBurnTask = -1; private int entityBurnTask = -1;
private int itemBurnTask = -1; private int itemBurnTask = -1;
@ -46,7 +46,7 @@ public class AcidTask {
// This part will kill monsters if they fall into the water because it is acid // This part will kill monsters if they fall into the water because it is acid
entityBurnTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(addon.getPlugin(), () -> getEntityStream() entityBurnTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(addon.getPlugin(), () -> getEntityStream()
// These entities are immune to acid // These entities are immune to acid
.filter(e -> !(e instanceof Guardian || e instanceof Squid || e instanceof Turtle || e instanceof Drowned)) .filter(e -> !IMMUNE.contains(e.getType()))
.filter(w -> w.getLocation().getBlock().getType().equals(Material.WATER)) .filter(w -> w.getLocation().getBlock().getType().equals(Material.WATER))
.forEach(e -> { .forEach(e -> {
if ((e instanceof Monster || e instanceof MagmaCube) && addon.getSettings().getAcidDamageMonster() > 0D) { if ((e instanceof Monster || e instanceof MagmaCube) && addon.getSettings().getAcidDamageMonster() > 0D) {
@ -84,8 +84,8 @@ public class AcidTask {
Set<Entity> newItemsInWater = new HashSet<>(); Set<Entity> newItemsInWater = new HashSet<>();
getEntityStream() getEntityStream()
.filter(e -> e.getType().equals(EntityType.DROPPED_ITEM)) .filter(e -> e.getType().equals(EntityType.DROPPED_ITEM))
.filter(e -> e.getLocation().getBlock().getType().equals(Material.WATER) .filter(e -> e.getLocation().getBlock().getType().equals(Material.WATER)
|| (e.getLocation().getY() > 0 && e.getLocation().getBlock().getRelative(BlockFace.DOWN).getType().equals(Material.WATER))) || (e.getLocation().getY() > 0 && e.getLocation().getBlock().getRelative(BlockFace.DOWN).getType().equals(Material.WATER)))
.forEach(e -> { .forEach(e -> {
if (itemsInWater.contains(e)) { if (itemsInWater.contains(e)) {
e.getWorld().playSound(e.getLocation(), Sound.ENTITY_CREEPER_PRIMED, 3F, 3F); e.getWorld().playSound(e.getLocation(), Sound.ENTITY_CREEPER_PRIMED, 3F, 3F);