PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #491 from Fate-JH/rep-distance

Browse source 
Reviving Players at a Distance
This commit is contained in:
Mazo 2020-06-10 10:24:48 +01:00 committed by GitHub
parent d658f22f71 1d0d7500ec
commit c290dca16b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/src/main/scala/net/psforever/objects/Players.scala
View file

@ -6,7 +6,7 @@ import net.psforever.objects.equipment.EquipmentSlot
import net.psforever.objects.inventory.InventoryItem
import net.psforever.objects.loadouts.InfantryLoadout
import net.psforever.packet.game.{InventoryStateMessage, RepairMessage}
import net.psforever.types.ExoSuitType
import net.psforever.types.{ExoSuitType, Vector3}
import services.Service
import services.avatar.{AvatarAction, AvatarServiceMessage}
@ -28,7 +28,8 @@ object Players {
def RevivingTickAction(target : Player, user : Player, item : Tool)(progress : Float) : Boolean = {
if(!target.isAlive && !target.isBackpack &&
user.isAlive && !user.isMoving &&
user.Slot(user.DrawnSlot).Equipment.contains(item) && item.Magazine > 0) {
user.Slot(user.DrawnSlot).Equipment.contains(item) && item.Magazine > 0 &&
Vector3.Distance(target.Position, user.Position) < target.Definition.RepairDistance) {
val magazine = item.Discharge
val events = target.Zone.AvatarEvents
val uname = user.Name