PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-02-12 19:31:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tying up some quirky cases where the the wrong tools elicited unexpected reactions from amenities (#385)

Browse source
This commit is contained in:
Fate-JH 2020-04-19 20:19:39 -04:00 • committed by GitHub
parent 2f6af23207
commit 484fcbf56d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala
View file

@ -158,10 +158,12 @@ class PlayerControl(player : Player) extends Actor
}
}
case CommonMessages.Use(user, Some(item : Tool)) if item.Definition == GlobalDefinitions.medicalapplicator && !player.isAlive =>
case CommonMessages.Use(user, Some(item : Tool)) if item.Definition == GlobalDefinitions.medicalapplicator =>
//revive
if(user != player && user.isAlive && !user.isMoving &&
!player.isBackpack &&
if(user != player &&
user.Faction == player.Faction &&
user.isAlive && !user.isMoving &&
!player.isAlive && !player.isBackpack &&
item.Magazine >= 25) {
sender ! CommonMessages.Progress(
4,