Skip to content

Fix identity health scaling #7

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
xGabou merged 1 commit into from
Jul 31, 2025
Merged

Fix identity health scaling #7

Show file tree
Hide file tree
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
7 changes: 5 additions & 2 deletions common/src/main/java/draylar/identity/mixin/PlayerManagerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ private void onRespawn(ServerPlayerEntity player, boolean alive, CallbackInfoRet

// Re-sync max health for identity
if(identity != null && IdentityConfig.getInstance().scalingHealth()) {
player.setHealth(Math.min(player.getHealth(), identity.getMaxHealth()));
player.getAttributeInstance(EntityAttributes.GENERIC_MAX_HEALTH).setBaseValue(Math.min(IdentityConfig.getInstance().maxHealth(), identity.getMaxHealth()));
float prevMax = player.getMaxHealth();
float ratio = prevMax <= 0 ? 1.0F : player.getHealth() / prevMax;
float newMax = Math.min(IdentityConfig.getInstance().maxHealth(), identity.getMaxHealth());
player.getAttributeInstance(EntityAttributes.GENERIC_MAX_HEALTH).setBaseValue(newMax);
player.setHealth(Math.max(1.0F, ratio * newMax));
player.networkHandler.sendPacket(new EntityAttributesS2CPacket(player.getId(), player.getAttributes().getAttributesToSend()));
}
}
Expand Down
15 changes: 10 additions & 5 deletions common/src/main/java/draylar/identity/mixin/player/PlayerEntityDataMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,20 +270,25 @@ public boolean updateIdentity(@Nullable LivingEntity identity) {
// refresh entity hitbox dimensions
((DimensionsRefresher) player).identity_refreshDimensions();

// Identity is valid and scaling health is on; set entity's max health and current health to reflect identity.
// Identity is valid and scaling health is on; set entity's max health and current health to reflect identity
if(identity != null && IdentityConfig.getInstance().scalingHealth()) {
player.setHealth(Math.min(player.getHealth(), identity.getMaxHealth()));
player.getAttributeInstance(EntityAttributes.GENERIC_MAX_HEALTH).setBaseValue(Math.min(IdentityConfig.getInstance().maxHealth(), identity.getMaxHealth()));
float prevMax = player.getMaxHealth();
float ratio = prevMax <= 0 ? 1.0F : player.getHealth() / prevMax;
float newMax = Math.min(IdentityConfig.getInstance().maxHealth(), identity.getMaxHealth());
player.getAttributeInstance(EntityAttributes.GENERIC_MAX_HEALTH).setBaseValue(newMax);
player.setHealth(Math.max(1.0F, ratio * newMax));
}

// If the identity is null (going back to player), set the player's base health value to 20 (default) to clear old changes.
if(identity == null) {
float prevMax = player.getMaxHealth();
float ratio = prevMax <= 0 ? 1.0F : player.getHealth() / prevMax;
if(IdentityConfig.getInstance().scalingHealth()) {
player.getAttributeInstance(EntityAttributes.GENERIC_MAX_HEALTH).setBaseValue(20);
}

// Clear health value if needed
player.setHealth(Math.min(player.getHealth(), player.getMaxHealth()));
// Clear health value if needed, scaling by previous ratio
player.setHealth(Math.max(1.0F, ratio * player.getMaxHealth()));
}

// update flight properties on player depending on identity
Expand Down
Loading