From f033db14fa5b0e01342ee7f54264f5e30d6ab91b Mon Sep 17 00:00:00 2001 From: Indyuce Date: Sat, 30 Oct 2021 12:46:38 +0200 Subject: [PATCH] fixed 'restore stamina' --- src/main/java/net/Indyuce/mmoitems/MMOUtils.java | 4 ++-- .../java/net/Indyuce/mmoitems/stat/RestoreFood.java | 4 ++-- .../java/net/Indyuce/mmoitems/stat/RestoreMana.java | 4 ++-- .../Indyuce/mmoitems/stat/RestoreSaturation.java | 13 ++++--------- .../net/Indyuce/mmoitems/stat/RestoreStamina.java | 4 ++-- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/main/java/net/Indyuce/mmoitems/MMOUtils.java b/src/main/java/net/Indyuce/mmoitems/MMOUtils.java index fce6da64..be607812 100644 --- a/src/main/java/net/Indyuce/mmoitems/MMOUtils.java +++ b/src/main/java/net/Indyuce/mmoitems/MMOUtils.java @@ -234,13 +234,13 @@ public class MMOUtils { /** * @param player Player to heal * @param saturation Saturation amount - * @param allowNegatives If passing a negative saturation value will desaturatie the entity x) + * @param allowNegatives If passing a negative saturation value will desaturate the entity x) *
* If false, negative values are just ignored */ public static void saturate(@NotNull Player player, double saturation, boolean allowNegatives) { if (saturation > 0 || allowNegatives) - player.setSaturation(Math.min(0, Math.min(20, player.getSaturation() + (float) saturation))); + player.setSaturation(Math.max(0, Math.min(20, player.getSaturation() + (float) saturation))); } /** diff --git a/src/main/java/net/Indyuce/mmoitems/stat/RestoreFood.java b/src/main/java/net/Indyuce/mmoitems/stat/RestoreFood.java index 16d0ba32..1d6bbe7d 100644 --- a/src/main/java/net/Indyuce/mmoitems/stat/RestoreFood.java +++ b/src/main/java/net/Indyuce/mmoitems/stat/RestoreFood.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; /** - * When a consumable is eaten, restores health. + * When a consumable is eaten, restores food. * * @author Gunging */ @@ -31,7 +31,7 @@ public class RestoreFood extends DoubleStat implements PlayerConsumable { // Get value DoubleData d = (DoubleData) mmo.getData(ItemStats.RESTORE_FOOD); - // Any health being provided? + // Any food being provided? if (d.getValue() != 0) MMOUtils.feed(player, SilentNumbers.ceil(d.getValue())); } diff --git a/src/main/java/net/Indyuce/mmoitems/stat/RestoreMana.java b/src/main/java/net/Indyuce/mmoitems/stat/RestoreMana.java index e377f39a..9dc73f43 100644 --- a/src/main/java/net/Indyuce/mmoitems/stat/RestoreMana.java +++ b/src/main/java/net/Indyuce/mmoitems/stat/RestoreMana.java @@ -11,7 +11,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; /** - * When a consumable is eaten, restores health. + * When a consumable is eaten, restores mana. * * @author Gunging */ @@ -30,7 +30,7 @@ public class RestoreMana extends DoubleStat implements PlayerConsumable { // Get value DoubleData d = (DoubleData) mmo.getData(ItemStats.RESTORE_MANA); - // Any health being provided? + // Any mana being provided? if (d.getValue() != 0) PlayerData.get(player).getRPG().giveMana(d.getValue()); } diff --git a/src/main/java/net/Indyuce/mmoitems/stat/RestoreSaturation.java b/src/main/java/net/Indyuce/mmoitems/stat/RestoreSaturation.java index c209795e..293d4c5a 100644 --- a/src/main/java/net/Indyuce/mmoitems/stat/RestoreSaturation.java +++ b/src/main/java/net/Indyuce/mmoitems/stat/RestoreSaturation.java @@ -1,6 +1,5 @@ package net.Indyuce.mmoitems.stat; -import io.lumine.mythic.lib.api.util.ui.SilentNumbers; import net.Indyuce.mmoitems.ItemStats; import net.Indyuce.mmoitems.MMOUtils; import net.Indyuce.mmoitems.api.item.mmoitem.VolatileMMOItem; @@ -12,7 +11,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; /** - * When a consumable is eaten, restores health. + * When a consumable is eaten, restores saturation. * * @author Gunging */ @@ -29,14 +28,10 @@ public class RestoreSaturation extends DoubleStat implements PlayerConsumable { * For some reason, it was in the earlier code that the default value * of restored saturation is 6... I am all for backwards compatibility * such that this must be respected. + * + * 6 is the saturation for a cooked beef */ - int saturation = 6; - if (mmo.hasData(ItemStats.RESTORE_SATURATION)) { - - // Get value - DoubleData d = (DoubleData) mmo.getData(ItemStats.RESTORE_SATURATION); - saturation = SilentNumbers.ceil(d.getValue()); - } + double saturation = mmo.hasData(ItemStats.RESTORE_SATURATION) ? ((DoubleData) mmo.getData(ItemStats.RESTORE_SATURATION)).getValue() : 6; // Any saturation being provided? if (saturation != 0) diff --git a/src/main/java/net/Indyuce/mmoitems/stat/RestoreStamina.java b/src/main/java/net/Indyuce/mmoitems/stat/RestoreStamina.java index 41ff5d3d..c664b404 100644 --- a/src/main/java/net/Indyuce/mmoitems/stat/RestoreStamina.java +++ b/src/main/java/net/Indyuce/mmoitems/stat/RestoreStamina.java @@ -11,7 +11,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; /** - * When a consumable is eaten, restores health. + * When a consumable is eaten, restores stamina. * * @author Gunging */ @@ -29,7 +29,7 @@ public class RestoreStamina extends DoubleStat implements PlayerConsumable { // Get value DoubleData d = (DoubleData) mmo.getData(ItemStats.RESTORE_STAMINA); - // Any health being provided? + // Any stamina being provided? if (d.getValue() != 0) PlayerData.get(player).getRPG().giveStamina(d.getValue()); }