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

invite changes

Browse source
This commit is contained in:
ScrawnyRonnie 2025-08-02 16:16:22 -04:00
parent 79dfef0e3b
commit 065f84231b
5 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/scala/net/psforever/actors/session/csr/SquadHandlerLogic.scala
View file

@ -28,21 +28,21 @@ class SquadHandlerLogic(val ops: SessionSquadHandlers, implicit val context: Act
/* packet */ /* packet */
def handleSquadDefinitionAction(pkt: SquadDefinitionActionMessage): Unit = { def handleSquadDefinitionAction(pkt: SquadDefinitionActionMessage): Unit = {
/*if (!player.spectator) { if (!player.spectator) {
val SquadDefinitionActionMessage(u1, u2, action) = pkt val SquadDefinitionActionMessage(u1, u2, action) = pkt
squadService ! SquadServiceMessage(player, continent, SquadServiceAction.Definition(u1, u2, action)) squadService ! SquadServiceMessage(player, continent, SquadServiceAction.Definition(u1, u2, action))
}*/ }
} }
def handleSquadMemberRequest(pkt: SquadMembershipRequest): Unit = { def handleSquadMemberRequest(pkt: SquadMembershipRequest): Unit = {
/* if (!player.spectator) { if (!player.spectator) {
val SquadMembershipRequest(request_type, char_id, unk3, player_name, unk5) = pkt val SquadMembershipRequest(request_type, char_id, unk3, player_name, unk5) = pkt
squadService ! SquadServiceMessage( squadService ! SquadServiceMessage(
player, player,
continent, continent,
SquadServiceAction.Membership(request_type, char_id, unk3, player_name, unk5) SquadServiceAction.Membership(request_type, char_id, unk3, player_name, unk5)
) )
}*/ }
} }
def handleSquadWaypointRequest(pkt: SquadWaypointRequest): Unit = { def handleSquadWaypointRequest(pkt: SquadWaypointRequest): Unit = {

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

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

6
src/main/scala/net/psforever/services/teamwork/invitations/IndirectInvite.scala
View file

@ -40,10 +40,10 @@ final case class IndirectInvite(originalRequester: Player, features: SquadFeatur
val leaderCharId = player.CharId val leaderCharId = player.CharId
val invitedPlayer = originalRequester.CharId val invitedPlayer = originalRequester.CharId
manager manager
.handleVacancyInvite(features, invitedPlayer, invitedPlayer, originalRequester) .handleVacancyInvite(features, invitedPlayer, leaderCharId, originalRequester)
.collect { .collect {
case (_, position) if manager.joinSquad(originalRequester, features, position) => case (_, position) if manager.joinSquad(originalRequester, features, position) =>
manager.acceptanceMessages(invitedPlayer, invitedPlayer, originalRequester.Name) manager.acceptanceMessages(leaderCharId, invitedPlayer, originalRequester.Name)
//clean up invitations specifically for this squad and this position //clean up invitations specifically for this squad and this position
val cleanedUpActiveInvitesForSquadAndPosition = manager.cleanUpActiveInvitesForSquadAndPosition(features.Squad.GUID, position) val cleanedUpActiveInvitesForSquadAndPosition = manager.cleanUpActiveInvitesForSquadAndPosition(features.Squad.GUID, position)
cleanedUpActiveInvitesForSquadAndPosition.collect { case (id, _) => cleanedUpActiveInvitesForSquadAndPosition.collect { case (id, _) =>
@ -79,7 +79,7 @@ final case class IndirectInvite(originalRequester: Player, features: SquadFeatur
.orElse { .orElse {
manager.publish( manager.publish(
leaderCharId, leaderCharId,
SquadResponse.SquadRelatedComment(s"Your invitation to ${player.Name} was accepted, but failed.") SquadResponse.SquadRelatedComment(s"Your invitation to ${originalRequester.Name} was accepted, but failed.")
) )
manager.publish( manager.publish(
invitedPlayer, invitedPlayer,

2
src/main/scala/net/psforever/services/teamwork/invitations/InvitationToCreateASquad.scala
View file

@ -114,7 +114,7 @@ final case class InvitationToCreateASquad(futureSquadLeader: Player)
SquadResponse.Membership(SquadResponseType.Reject, invitingPlayerCharId, Some(rejectingPlayer), player.Name, unk5 = false) SquadResponse.Membership(SquadResponseType.Reject, invitingPlayerCharId, Some(rejectingPlayer), player.Name, unk5 = false)
) )
manager.publish( manager.publish(
rejectingPlayer, invitingPlayerCharId,
SquadResponse.SquadRelatedComment(s"Your request to form a squad has been refused.") SquadResponse.SquadRelatedComment(s"Your request to form a squad has been refused.")
) )
} }

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

@ -109,10 +109,10 @@ final case class InvitationToJoinSquad(charId: Long, name: String, features: Squ
//rejectingPlayer is the would-be squad member; the squad leader sent the request and was rejected //rejectingPlayer is the would-be squad member; the squad leader sent the request and was rejected
doRejection(manager, player, rejectingPlayer) doRejection(manager, player, rejectingPlayer)
manager.rejectionMessages(rejectingPlayer, charId, player.Name) manager.rejectionMessages(rejectingPlayer, charId, player.Name)
manager.publish( /*manager.publish(
rejectingPlayer, rejectingPlayer,
SquadResponse.SquadRelatedComment(s"Your request to join squad '${features.Squad.Task}' has been refused.") SquadResponse.SquadRelatedComment(s"Your request to join squad '${features.Squad.Task}' has been refused.")
) )*/
} }
def doRejection( def doRejection(