Skip to content

Fix max health causing doubling issues #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benwoo1110 merged 1 commit into from
Jun 1, 2025
Merged

Fix max health causing doubling issues #598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 33 additions & 17 deletions src/main/java/org/mvplugins/multiverse/inventories/share/Sharables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.dumptruckman.minecraft.util.Logging;
import com.google.common.collect.Sets;
import org.bukkit.Material;
import org.bukkit.advancement.AdvancementProgress;
import org.jetbrains.annotations.ApiStatus;
import org.mvplugins.multiverse.core.economy.MVEconomist;
Expand All @@ -18,7 +19,6 @@
import org.mvplugins.multiverse.inventories.util.PlayerStats;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
import org.bukkit.Statistic;
Expand Down Expand Up @@ -198,19 +198,18 @@ public boolean updatePlayer(Player player, ProfileData profile) {
new SharableHandler<Double>() {
@Override
public void updateProfile(ProfileData profile, Player player) {
profile.set(MAX_HEALTH, getMaxHealth(player));
// todo: Look into storing max health modifiers as well
profile.set(MAX_HEALTH, getBaseHealth(player));
}

@Override
public boolean updatePlayer(Player player, ProfileData profile) {
Double value = profile.get(MAX_HEALTH);
if (value == null) {
Option.of(maxHealthAttr).map(player::getAttribute)
.peek(attr -> attr.setBaseValue(attr.getDefaultValue()));
setBaseHealth(player, getDefaultMaxHealth(player));
return false;
}
Option.of(maxHealthAttr).map(player::getAttribute)
.peek(attr -> attr.setBaseValue(value));
setBaseHealth(player, value);
return true;
}
}).stringSerializer(new ProfileEntry(true, DataStrings.PLAYER_MAX_HEALTH))
Expand Down Expand Up @@ -239,31 +238,48 @@ public boolean updatePlayer(Player player, ProfileData profile) {
player.setHealth(PlayerStats.HEALTH);
return false;
}
double maxHealth = getMaxHealth(player);
// This share may handled before MAX_HEALTH.
// Thus this is needed to ensure there is no loss in health stored
if (value > maxHealth) {
Option.of(maxHealthAttr).map(player::getAttribute)
.peek(attr -> attr.setBaseValue(value));
if (value < 0) {
player.setHealth(0);
return false;
}
player.setHealth(value);
if (value > getMaxHealth(player)) {
// Try set max health attribute
setBaseHealth(player, Objects.requireNonNullElse(profile.get(MAX_HEALTH), getDefaultMaxHealth(player)));
}
double newMaxHealth = getMaxHealth(player);
player.setHealth(value > newMaxHealth ? newMaxHealth : value);
return true;
} catch (IllegalArgumentException e) {
Logging.warning("Invalid value '" + value + "': " + e.getMessage());
player.setHealth(getMaxHealth(player));
return false;
}
return true;
}

}).stringSerializer(new ProfileEntry(true, DataStrings.PLAYER_HEALTH))
.altName("health").altName("hp").altName("hitpoints").build();

private static double getMaxHealth(Player player) {
private static double getDefaultMaxHealth(Player player) {
return Option.of(maxHealthAttr).map(player::getAttribute)
.map(AttributeInstance::getDefaultValue)
.getOrElse(PlayerStats.MAX_HEALTH);
}

private static double getBaseHealth(Player player) {
return Option.of(maxHealthAttr).map(player::getAttribute)
.map(AttributeInstance::getBaseValue)
.getOrElse(PlayerStats.MAX_HEALTH);
}

private static void setBaseHealth(Player player, double value) {
Option.of(maxHealthAttr).map(player::getAttribute)
.peek(attr -> attr.setBaseValue(value));
}

private static double getMaxHealth(Player player) {
return Option.of(maxHealthAttr).map(player::getAttribute)
.map(AttributeInstance::getValue)
.getOrElse(PlayerStats.MAX_HEALTH);
}

/**
* Sharing Remaining Air.
*/
Expand Down
Loading