PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-25 06:49:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

10 / 100 * 255 = 0

Browse source 
When a player dont have full life, he is on ground with 0 HP ;)
This commit is contained in:
SouNourS 2018-02-22 16:02:16 +01:00
parent 599d767598
commit d34817c5a8
2 changed files with 3 additions and 2 deletions
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( Success(
CharacterData( CharacterData(
MakeAppearanceData(obj), MakeAppearanceData(obj),
obj.Health / obj.MaxHealth * 255, //TODO not precise 255 * obj.Health / obj.MaxHealth, //TODO not precise
if(MaxArmor == 0) { 0 } else { obj.Armor / MaxArmor * 255 }, //TODO not precise if(MaxArmor == 0) { 0 } else { 255 * obj.Armor / MaxArmor }, //TODO not precise
DressBattleRank(obj), DressBattleRank(obj),
DressCommandRank(obj), DressCommandRank(obj),
recursiveMakeImplantEffects(obj.Implants.iterator), recursiveMakeImplantEffects(obj.Implants.iterator),

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

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