Skip to content

Commit d722e9f

Browse files
authored
Version 1.15.2 (#118)
* Add support for 1.16.5
1 parent 8a0928f commit d722e9f

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<!-- Do not change unless you want different name for local builds. -->
6666
<build.number>-LOCAL</build.number>
6767
<!-- This allows to change between versions. -->
68-
<build.version>1.15.1</build.version>
68+
<build.version>1.15.2</build.version>
6969
<!-- Sonar Cloud -->
7070
<sonar.projectKey>BentoBoxWorld_AcidIsland</sonar.projectKey>
7171
<sonar.organization>bentobox-world</sonar.organization>

src/main/java/world/bentobox/acidisland/world/AcidTask.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package world.bentobox.acidisland.world;
22

33
import java.util.ArrayList;
4-
import java.util.Arrays;
4+
import java.util.Collections;
55
import java.util.List;
66
import java.util.Map;
77
import java.util.Objects;
@@ -21,6 +21,8 @@
2121
import org.bukkit.entity.WaterMob;
2222
import org.bukkit.scheduler.BukkitTask;
2323

24+
import com.google.common.base.Enums;
25+
2426
import world.bentobox.acidisland.AcidIsland;
2527
import world.bentobox.acidisland.events.EntityDamageByAcidEvent;
2628
import world.bentobox.acidisland.events.EntityDamageByAcidEvent.Acid;
@@ -29,7 +31,15 @@
2931

3032
public class AcidTask {
3133
private final AcidIsland addon;
32-
private static final List<EntityType> IMMUNE = Arrays.asList(EntityType.TURTLE, EntityType.POLAR_BEAR, EntityType.DROWNED, EntityType.AXOLOTL);
34+
private static final List<EntityType> IMMUNE;
35+
static {
36+
List<EntityType> i = new ArrayList<>();
37+
i.add(EntityType.POLAR_BEAR);
38+
i.add(EntityType.TURTLE);
39+
i.add(EntityType.DROWNED);
40+
Enums.getIfPresent(EntityType.class, "AXOLOTL").toJavaUtil().ifPresent(i::add);
41+
IMMUNE = Collections.unmodifiableList(i);
42+
}
3343
private Map<Entity, Long> itemsInWater = new ConcurrentHashMap<>();
3444
private final BukkitTask findMobsTask;
3545

src/main/resources/addon.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: AcidIsland
22
main: world.bentobox.acidisland.AcidIsland
33
version: ${version}${build.number}
4-
api-version: ${bentobox.version}
4+
api-version: 1.16.5
55
metrics: true
66
repository: "BentoBoxWorld/AcidIsland"
77
icon: "OAK_BOAT"

0 commit comments

Comments
 (0)