Skip to content

Fix/max health #592

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 2 commits into from
May 9, 2025
Merged

Fix/max health #592

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8db8dd
Use getBaseValue instead of getValue for max health attribute
benwoo1110 May 7, 2025
a291038
Fix max health fallback when setting health
benwoo1110 May 7, 2025
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
17 changes: 9 additions & 8 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 @@ -191,6 +191,7 @@ public boolean updatePlayer(Player player, ProfileData profile) {
/**
* Sharing Max Health.
*/
//todo: maybe store attribute modifier as well
public static final Sharable<Double> MAX_HEALTH = new Sharable.Builder<>("max_hit_points", Double.class,
new SharableHandler<Double>() {
@Override
Expand Down Expand Up @@ -231,22 +232,22 @@ public void updateProfile(ProfileData profile, Player player) {
@Override
public boolean updatePlayer(Player player, ProfileData profile) {
Double value = profile.get(HEALTH);
if (value == null) {
player.setHealth(PlayerStats.HEALTH);
return false;
}
try {
if (value == null) {
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(maxHealth));
.peek(attr -> attr.setBaseValue(value));
}
player.setHealth(value);
} catch (IllegalArgumentException e) {
Logging.fine("Invalid value '" + value + "': " + e.getMessage());
player.setHealth(PlayerStats.HEALTH);
Logging.warning("Invalid value '" + value + "': " + e.getMessage());
player.setHealth(getMaxHealth(player));
return false;
}
return true;
Expand All @@ -257,7 +258,7 @@ public boolean updatePlayer(Player player, ProfileData profile) {

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

Expand Down
Loading