PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-13 15:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge rebase resolutions

Browse source
This commit is contained in:
FateJH 2020-07-14 17:52:19 -04:00
parent 811c7b09b5
commit 2054586a0d
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/scala/net/psforever/actors/session/SessionActor.scala
View file

@ -3807,9 +3807,6 @@ class SessionActor extends Actor with MDCContextAware {
//log.info(s"$msg") //log.info(s"$msg")
persist() persist()
turnCounterFunc(avatar_guid) turnCounterFunc(avatar_guid)
if(is_crouching && !player.Crouching) {
//sendResponse(PlanetsideAttributeMessage(player.GUID, 54, 2))
}
val isMoving = WorldEntity.isMoving(vel) val isMoving = WorldEntity.isMoving(vel)
val isMovingPlus = isMoving || is_jumping || jump_thrust val isMovingPlus = isMoving || is_jumping || jump_thrust
if (isMovingPlus) { if (isMovingPlus) {

2
src/main/scala/net/psforever/objects/Player.scala
View file

@ -355,7 +355,7 @@ class Player(var avatar: Avatar)
afk = away afk = away
AwayFromKeyboard AwayFromKeyboard
} }
def Aura : Set[AuraEffect.Value] = aura def Aura : Set[AuraEffect.Value] = aura
def AddEffectToAura(effect : AuraEffect.Value) : Set[AuraEffect.Value] = { def AddEffectToAura(effect : AuraEffect.Value) : Set[AuraEffect.Value] = {