From 9938901f627eebb1bbc4b7a8d4605cfc9f035482 Mon Sep 17 00:00:00 2001 From: Xanadu13 Date: Tue, 14 Jan 2025 18:23:31 +0800 Subject: [PATCH] bug fix #30 --- .../xanadu/enderdragon/manager/DragonManager.java | 5 +++-- .../pers/xanadu/enderdragon/util/CollectionUtil.java | 11 +++++++++++ src/main/resources/plugin.yml | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 src/main/java/pers/xanadu/enderdragon/util/CollectionUtil.java diff --git a/src/main/java/pers/xanadu/enderdragon/manager/DragonManager.java b/src/main/java/pers/xanadu/enderdragon/manager/DragonManager.java index 15c3d28..6d17204 100644 --- a/src/main/java/pers/xanadu/enderdragon/manager/DragonManager.java +++ b/src/main/java/pers/xanadu/enderdragon/manager/DragonManager.java @@ -19,6 +19,7 @@ import pers.xanadu.enderdragon.config.Lang; import pers.xanadu.enderdragon.metadata.DragonInfo; import pers.xanadu.enderdragon.reward.RewardDist; import pers.xanadu.enderdragon.reward.SpecialLoot; +import pers.xanadu.enderdragon.util.CollectionUtil; import pers.xanadu.enderdragon.util.ExtraPotionEffect; import pers.xanadu.enderdragon.metadata.MyDragon; import pers.xanadu.enderdragon.util.Version; @@ -297,7 +298,7 @@ public class DragonManager { if(target == null) continue; if("%attacker%".equals(target)){ loot_mp.compute(0,(k,v)->{ - if(v==null) return Collections.singletonList(specialLoot); + if(v==null) return CollectionUtil.vec(specialLoot); v.add(specialLoot); return v; }); @@ -307,7 +308,7 @@ public class DragonManager { if (matcher.find()) { Integer rank = Integer.parseInt(matcher.group(1)); loot_mp.compute(rank,(k,v)->{ - if(v==null) return Collections.singletonList(specialLoot); + if(v==null) return CollectionUtil.vec(specialLoot); v.add(specialLoot); return v; }); diff --git a/src/main/java/pers/xanadu/enderdragon/util/CollectionUtil.java b/src/main/java/pers/xanadu/enderdragon/util/CollectionUtil.java new file mode 100644 index 0000000..2bc4c43 --- /dev/null +++ b/src/main/java/pers/xanadu/enderdragon/util/CollectionUtil.java @@ -0,0 +1,11 @@ +package pers.xanadu.enderdragon.util; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +public final class CollectionUtil { + public static List vec(T ...elems) { + return Arrays.stream(elems).collect(Collectors.toList()); + } +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 787b463..c1f2b82 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: EnderDragon -version: 2.5.4 +version: 2.5.5 main: pers.xanadu.enderdragon.EnderDragon author: Xanadu13 api-version: 1.13