PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-20 02:54:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #191 from SouNourS/HP

Browse source 
10 / 100 * 255 = 0
This commit is contained in:
Fate-JH 2018-03-01 07:18:48 -05:00 committed by GitHub
parent ce04ffae90 d34817c5a8
commit 02c4fb26c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
View file

@ -15,8 +15,8 @@ class AvatarConverter extends ObjectCreateConverter[Player]() {
Success(
CharacterData(
MakeAppearanceData(obj),
obj.Health / obj.MaxHealth * 255, //TODO not precise
if(MaxArmor == 0) { 0 } else { obj.Armor / MaxArmor * 255 }, //TODO not precise
255 * obj.Health / obj.MaxHealth, //TODO not precise
if(MaxArmor == 0) { 0 } else { 255 * obj.Armor / MaxArmor }, //TODO not precise
DressBattleRank(obj),
DressCommandRank(obj),
recursiveMakeImplantEffects(obj.Implants.iterator),

1
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -1010,6 +1010,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
log.info("Load the now-registered player")
//load the now-registered player
tplayer.Spawn
tplayer.Health = 50
val dcdata = tplayer.Definition.Packet.DetailedConstructorData(tplayer).get
sendResponse(ObjectCreateDetailedMessage(ObjectClass.avatar, tplayer.GUID, dcdata))
avatarService ! AvatarServiceMessage(tplayer.Continent, AvatarAction.LoadPlayer(tplayer.GUID, tplayer.Definition.Packet.ConstructorData(tplayer).get))