Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-27 12:45:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix scaling of player health bar

Browse Source
This commit is contained in:
Mike Primm 2018-12-07 21:33:35 -06:00
parent 505e6b3b90
commit 3650dc7d2a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DynmapCore/src/main/resources/extracted/web/js/playermarkers.js
View File

@ -56,10 +56,10 @@ componentconstructors['playermarkers'] = function(dynmap, configuration) {
if (player.health !== undefined && player.armor !== undefined) {
player.healthBar = $('<div/>')
.addClass('playerHealth')
.css('width', (player.health/2*5) + 'px');
.css('width', Math.ceil(player.health*2.5) + 'px');
player.armorBar = $('<div/>')
.addClass('playerArmor')
.css('width', (player.armor/2*5) + 'px');
.css('width', Math.ceil(player.armor*2.5) + 'px');
$('<div/>')
.addClass('playerHealthBackground')
@ -97,8 +97,8 @@ componentconstructors['playermarkers'] = function(dynmap, configuration) {
if (configuration.showplayerhealth) {
if (player.health !== undefined && player.armor !== undefined) {
player.healthContainer.css('display','block');
player.healthBar.css('width', (player.health/2*5) + 'px');
player.armorBar.css('width', (player.armor/2*5) + 'px');
player.healthBar.css('width', Math.ceil(player.health*2.5) + 'px');
player.armorBar.css('width', Math.ceil(player.armor*2.5) + 'px');
} else {
player.healthContainer.css('display','none');
}

5
spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View File

@ -631,8 +631,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
}
@Override
public double getHealth() {
if(player != null)
return helper.getHealth(player);
if(player != null) {
return Math.ceil(2.0 * player.getHealth() / player.getMaxHealth() * player.getHealthScale()) / 2.0;
}
else
return 0;
}