Commit 7e3ecea4 authored by Marwolf's avatar Marwolf 💬

Merge branch '2.0.0' into '2.0.0'

Fixes hitsplat colors switched

See merge request !2229
parents 8a05b1b4 f1d81f5c
......@@ -5636,7 +5636,7 @@ public final class mudclient implements Runnable {
var15 = x - overlayMovement * 10 / 100;
}
this.getSurface().drawSprite(spriteSelect(EntityHandler.GUIparts.get(GUIPARTS.DAMAGEGIVEN.id())), var15 - (12 - width1 / 2),
this.getSurface().drawSprite(spriteSelect(EntityHandler.GUIparts.get(GUIPARTS.DAMAGETAKEN.id())), var15 - (12 - width1 / 2),
y + height / 2 - 12);
this.getSurface().drawColoredStringCentered(width1 / 2 - 1 + var15, "" + npc.damageTaken, 0xFFFFFF,
0, 3, 5 + y + height / 2);
......@@ -5836,7 +5836,7 @@ public final class mudclient implements Runnable {
var14 = x - overlayMovement * 10 / 100;
}
this.getSurface().drawSprite(spriteSelect(EntityHandler.GUIparts.get(GUIPARTS.DAMAGETAKEN.id())), width / 2 + var14 - 12,
this.getSurface().drawSprite(spriteSelect(EntityHandler.GUIparts.get(GUIPARTS.DAMAGEGIVEN.id())), width / 2 + var14 - 12,
height / 2 + (y - 12));
this.getSurface().drawColoredStringCentered(width / 2 + (var14 - 1), "" + player.damageTaken,
0xFFFFFF, 0, 3, height / 2 + y + 5);
......
......@@ -5636,7 +5636,7 @@ public final class mudclient implements Runnable {
var15 = x - overlayMovement * 10 / 100;
}
this.getSurface().drawSprite(spriteSelect(EntityHandler.GUIparts.get(GUIPARTS.DAMAGEGIVEN.id())), var15 - (12 - width1 / 2),
this.getSurface().drawSprite(spriteSelect(EntityHandler.GUIparts.get(GUIPARTS.DAMAGETAKEN.id())), var15 - (12 - width1 / 2),
y + height / 2 - 12);
this.getSurface().drawColoredStringCentered(width1 / 2 - 1 + var15, "" + npc.damageTaken, 0xFFFFFF,
0, 3, 5 + y + height / 2);
......@@ -5836,7 +5836,7 @@ public final class mudclient implements Runnable {
var14 = x - overlayMovement * 10 / 100;
}
this.getSurface().drawSprite(spriteSelect(EntityHandler.GUIparts.get(GUIPARTS.DAMAGETAKEN.id())), width / 2 + var14 - 12,
this.getSurface().drawSprite(spriteSelect(EntityHandler.GUIparts.get(GUIPARTS.DAMAGEGIVEN.id())), width / 2 + var14 - 12,
height / 2 + (y - 12));
this.getSurface().drawColoredStringCentered(width / 2 + (var14 - 1), "" + player.damageTaken,
0xFFFFFF, 0, 3, height / 2 + y + 5);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment