merge: tag '1.8.1' into develop

1.8.1 1.8.1

Author: zetastormy

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.gradleup.shadow") version ("8.3.5")
-    id("io.papermc.paperweight.userdev") version ("2.0.0-beta.9")
+    id("io.papermc.paperweight.userdev") version ("2.0.0-beta.10")
 }
 
 group = "team.devblook"

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
-projectVersion=1.8.0
+projectVersion=1.8.1
 libsPackage=team.devblook.akropolis.libs

src/main/java/team/devblook/akropolis/module/modules/player/PlayerListener.java

@@ -20,9 +20,7 @@
 package team.devblook.akropolis.module.modules.player;
 
 import net.kyori.adventure.text.Component;
-import org.bukkit.Bukkit;
-import org.bukkit.Color;
-import org.bukkit.FireworkEffect;
+import org.bukkit.*;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.configuration.ConfigurationSection;
@@ -45,6 +43,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class PlayerListener extends Module {
     private ConfigurationSection playersSection;
@@ -128,7 +127,13 @@ public void onPlayerJoin(PlayerJoinEvent event) {
         if (spawnHeal) {
             player.setFoodLevel(20);
 
-            AttributeInstance maxHealth = player.getAttribute(Attribute.MAX_HEALTH);
+            Attribute legacyMaxHealth = Registry.ATTRIBUTE.get(NamespacedKey.minecraft("generic.max_health"));
+            Attribute maxHealthAttribute = legacyMaxHealth;
+
+            if (legacyMaxHealth == null) maxHealthAttribute = Registry.ATTRIBUTE.get(NamespacedKey.minecraft("max_health"));
+            if (maxHealthAttribute == null) return;
+
+            AttributeInstance maxHealth = player.getAttribute(maxHealthAttribute);
             if (maxHealth == null) return;
 
             player.setHealth(maxHealth.getBaseValue());

src/main/java/team/devblook/akropolis/module/modules/world/WorldProtect.java

@@ -46,7 +46,11 @@
 import team.devblook.akropolis.module.ModuleType;
 import team.devblook.akropolis.module.modules.hologram.Hologram;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @SuppressWarnings({"deprecation", "ConstantConditions"})
 public class WorldProtect extends Module {
@@ -71,8 +75,8 @@ public class WorldProtect extends Module {
     private static final Set<Material> INTERACTABLE;
 
     static {
-        INTERACTABLE = Set.of(XMaterial.ANVIL.get(), XMaterial.BLACK_BED.get(), XMaterial.BLUE_BED.get(),
-                XMaterial.BROWN_BED.get(), XMaterial.CYAN_BED.get(), XMaterial.GRAY_BED.get(),
+        List<Material> rawInteractable = Arrays.asList(XMaterial.ANVIL.get(), XMaterial.BLACK_BED.get(),
+                XMaterial.BLUE_BED.get(), XMaterial.BROWN_BED.get(), XMaterial.CYAN_BED.get(), XMaterial.GRAY_BED.get(),
                 XMaterial.GREEN_BED.get(), XMaterial.LIGHT_BLUE_BED.get(), XMaterial.LIME_BED.get(),
                 XMaterial.MAGENTA_BED.get(), XMaterial.ORANGE_BED.get(), XMaterial.PINK_BED.get(),
                 XMaterial.PURPLE_BED.get(), XMaterial.RED_BED.get(), XMaterial.WHITE_BED.get(),
@@ -152,6 +156,8 @@ public class WorldProtect extends Module {
                 XMaterial.WARPED_WALL_SIGN.get(), XMaterial.PALE_OAK_HANGING_SIGN.get(),
                 XMaterial.PALE_OAK_SIGN.get(), XMaterial.PALE_OAK_WALL_HANGING_SIGN.get(),
                 XMaterial.PALE_OAK_WALL_SIGN.get());
+
+        INTERACTABLE = rawInteractable.stream().filter(Objects::nonNull).collect(Collectors.toUnmodifiableSet());
     }
 
     public WorldProtect(AkropolisPlugin plugin) {