GH-1036 GH-1037 Fillup oxygen, support custom health level. (#1038)

Author: vLuckyyy

eternalcore-core/src/main/java/com/eternalcode/core/feature/heal/HealCommand.java

@@ -5,10 +5,10 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
+import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Context;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 
@@ -25,7 +25,7 @@ class HealCommand {
     @Execute
     @Permission("eternalcore.heal")
     @DescriptionDocs(description = "Heal yourself")
-    void execute(@Context Player player) {
+    void healSelf(@Context Player player) {
         this.heal(player);
 
         this.noticeService.player(player.getUniqueId(), translation -> translation.player().healMessage());
@@ -34,30 +34,38 @@ void execute(@Context Player player) {
     @Execute
     @Permission("eternalcore.heal.other")
     @DescriptionDocs(description = "Heal other player", arguments = "<player>")
-    void execute(@Context Viewer viewer, @Arg Player target) {
+    void healOther(@Context Viewer viewer, @Arg Player target) {
         this.heal(target);
 
         this.noticeService.create()
             .notice(translation -> translation.player().healMessage())
             .player(target.getUniqueId())
             .send();
 
-
         this.noticeService.create()
             .notice(translation -> translation.player().healMessageBy())
             .placeholder("{PLAYER}", target.getName())
             .viewer(viewer)
             .send();
     }
 
-    void heal(Player player) {
+    private void heal(Player player) {
+        /*
+         * Sets the player's health to their maximum health.
+         * We avoid using Attribute.GENERIC_MAX_HEALTH or Attribute.MAX_HEALTH directly
+         * because the Attribute API has changed in recent Paper versions,
+         * To maintain compatibility with older versions, we use player.getMaxHealth(),
+         * which provides a stable way to get the player's max health.
+         */
+        double maxHealth = player.getMaxHealth();
+
+        player.setHealth(maxHealth);
         player.setFoodLevel(20);
-        player.setHealth(20);
         player.setFireTicks(0);
+        player.setRemainingAir(player.getMaximumAir());
 
-        for (PotionEffect potionEffect : player.getActivePotionEffects()) {
-            player.removePotionEffect(potionEffect.getType());
+        for (PotionEffect effect : player.getActivePotionEffects()) {
+            player.removePotionEffect(effect.getType());
         }
     }
-
 }