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

squads will work eventually

Browse source
This commit is contained in:
ScrawnyRonnie 2025-08-01 21:20:54 -04:00
parent 749a611b87
commit 79dfef0e3b
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3853,7 +3853,8 @@ class ZoningOperations(
} }
def startEnqueueSquadMessages: Boolean = { def startEnqueueSquadMessages: Boolean = {
sessionLogic.zoning.zoneReload && sessionLogic.zoning.spawn.setAvatar && player.isAlive println(s"${sessionLogic.zoning.zoneReload} ${sessionLogic.zoning.spawn.setAvatar} ${player.isAlive}")
!sessionLogic.zoning.zoneReload && sessionLogic.zoning.spawn.setAvatar && player.isAlive
} }
def enqueueNewActivity(newTasking: SpawnOperations.ActivityQueuedTask): Unit = { def enqueueNewActivity(newTasking: SpawnOperations.ActivityQueuedTask): Unit = {

1
src/main/scala/net/psforever/services/teamwork/SquadInvitationManager.scala
View file

@ -368,6 +368,7 @@ class SquadInvitationManager(subs: SquadSubscriptionEntity, parent: ActorRef) {
charId, charId,
SquadResponse.Membership(SquadResponseType.Cancel, charId, Some(0L), name, unk5 = false) SquadResponse.Membership(SquadResponseType.Cancel, charId, Some(0L), name, unk5 = false)
) )
case None => ()
} }
None None
} }

4
src/main/scala/net/psforever/services/teamwork/SquadService.scala
View file

@ -274,8 +274,8 @@ class SquadService extends Actor {
SquadActionMembershipCancel(cancellingPlayer, tplayer) SquadActionMembershipCancel(cancellingPlayer, tplayer)
case SquadAction.Membership(SquadRequestType.Promote, _, _, _, _) => () case SquadAction.Membership(SquadRequestType.Promote, _, _, _, _) => ()
// case SquadAction.Membership(SquadRequestType.Promote, promotingPlayer, Some(_promotedPlayer), promotedName, _) => case SquadAction.Membership(SquadRequestType.Promote, promotingPlayer, Some(_promotedPlayer), promotedName, _) =>
// SquadActionMembershipPromote(promotingPlayer, _promotedPlayer, promotedName, SquadServiceMessage(tplayer, zone, action), sender()) SquadActionMembershipPromote(promotingPlayer, _promotedPlayer, promotedName, SquadServiceMessage(tplayer, zone, action), sender())
case SquadAction.Membership(event, _, _, _, _) => case SquadAction.Membership(event, _, _, _, _) =>
info(s"SquadAction.Membership: $event is not yet supported") info(s"SquadAction.Membership: $event is not yet supported")

4
src/main/scala/net/psforever/services/teamwork/SquadSwitchboard.scala
View file

@ -653,7 +653,7 @@ class SquadSwitchboard(
if (squad.Leader.CharId == char_id) { if (squad.Leader.CharId == char_id) {
membership.lift(position) match { membership.lift(position) match {
case Some(toMember) => case Some(toMember) =>
//SquadActionMembershipPromote(char_id, toMember.CharId) SquadActionMembershipPromote(char_id, toMember.CharId)
case _ => ; case _ => ;
} }
} else { } else {
@ -684,7 +684,7 @@ class SquadSwitchboard(
def SquadActionMembership(action: Any): Unit = { def SquadActionMembership(action: Any): Unit = {
action match { action match {
case SquadAction.Membership(SquadRequestType.Promote, promotingPlayer, Some(promotedPlayer), _, _) => case SquadAction.Membership(SquadRequestType.Promote, promotingPlayer, Some(promotedPlayer), _, _) =>
//SquadActionMembershipPromote(promotingPlayer, promotedPlayer) SquadActionMembershipPromote(promotingPlayer, promotedPlayer)
case SquadAction.Membership(event, _, _, _, _) => case SquadAction.Membership(event, _, _, _, _) =>
log.debug(s"SquadAction.Membership: $event is not supported here") log.debug(s"SquadAction.Membership: $event is not supported here")