Upstream/AcidIsland
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/AcidIsland.git synced 2024-11-25 12:15:57 +01:00
Code Issues Projects Releases Wiki Activity

Version 1.15.2 (#118)

Browse Source 
* Add support for 1.16.5
This commit is contained in:
tastybento 2021-11-27 11:32:45 -08:00 committed by GitHub
parent 8a0928f087
commit d722e9f4ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -65,7 +65,7 @@
<!-- Do not change unless you want different name for local builds. --> <!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number> <build.number>-LOCAL</build.number>
<!-- This allows to change between versions. --> <!-- This allows to change between versions. -->
<build.version>1.15.1</build.version> <build.version>1.15.2</build.version>
<!-- Sonar Cloud --> <!-- Sonar Cloud -->
<sonar.projectKey>BentoBoxWorld_AcidIsland</sonar.projectKey> <sonar.projectKey>BentoBoxWorld_AcidIsland</sonar.projectKey>
<sonar.organization>bentobox-world</sonar.organization> <sonar.organization>bentobox-world</sonar.organization>

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

@ -1,7 +1,7 @@
package world.bentobox.acidisland.world; package world.bentobox.acidisland.world;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@ -21,6 +21,8 @@ import org.bukkit.entity.Monster;
import org.bukkit.entity.WaterMob; import org.bukkit.entity.WaterMob;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
import com.google.common.base.Enums;
import world.bentobox.acidisland.AcidIsland; import world.bentobox.acidisland.AcidIsland;
import world.bentobox.acidisland.events.EntityDamageByAcidEvent; import world.bentobox.acidisland.events.EntityDamageByAcidEvent;
import world.bentobox.acidisland.events.EntityDamageByAcidEvent.Acid; import world.bentobox.acidisland.events.EntityDamageByAcidEvent.Acid;
@ -29,7 +31,15 @@ import world.bentobox.acidisland.listeners.AcidEffect;
public class AcidTask { public class AcidTask {
private final AcidIsland addon; private final AcidIsland addon;
private static final List<EntityType> IMMUNE = Arrays.asList(EntityType.TURTLE, EntityType.POLAR_BEAR, EntityType.DROWNED, EntityType.AXOLOTL); private static final List<EntityType> IMMUNE;
static {
List<EntityType> i = new ArrayList<>();
i.add(EntityType.POLAR_BEAR);
i.add(EntityType.TURTLE);
i.add(EntityType.DROWNED);
Enums.getIfPresent(EntityType.class, "AXOLOTL").toJavaUtil().ifPresent(i::add);
IMMUNE = Collections.unmodifiableList(i);
}
private Map<Entity, Long> itemsInWater = new ConcurrentHashMap<>(); private Map<Entity, Long> itemsInWater = new ConcurrentHashMap<>();
private final BukkitTask findMobsTask; private final BukkitTask findMobsTask;

2
src/main/resources/addon.yml
View File

@ -1,7 +1,7 @@
name: AcidIsland name: AcidIsland
main: world.bentobox.acidisland.AcidIsland main: world.bentobox.acidisland.AcidIsland
version: ${version}${build.number} version: ${version}${build.number}
api-version: ${bentobox.version} api-version: 1.16.5
metrics: true metrics: true
repository: "BentoBoxWorld/AcidIsland" repository: "BentoBoxWorld/AcidIsland"
icon: "OAK_BOAT" icon: "OAK_BOAT"