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

attempt at mitigating geowarp immortality (#288)

Browse source
This commit is contained in:
Fate-JH 2019-10-30 22:47:04 -04:00 • committed by GitHub
parent aec9c15bdd
commit cea105042c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -5502,7 +5502,6 @@ class WorldSessionActor extends Actor with MDCContextAware {
case msg @ WarpgateRequest(continent_guid, building_guid, dest_building_guid, dest_continent_guid, unk1, unk2) => case msg @ WarpgateRequest(continent_guid, building_guid, dest_building_guid, dest_continent_guid, unk1, unk2) =>
log.info(s"WarpgateRequest: $msg") log.info(s"WarpgateRequest: $msg")
if(deadState != DeadState.RespawnTime) { if(deadState != DeadState.RespawnTime) {
deadState = DeadState.RespawnTime
continent.Buildings.values.find(building => building.GUID == building_guid) match { continent.Buildings.values.find(building => building.GUID == building_guid) match {
case Some(wg : WarpGate) if (wg.Active && (GetKnownVehicleAndSeat() match { case Some(wg : WarpGate) if (wg.Active && (GetKnownVehicleAndSeat() match {
case (Some(vehicle), _) => case (Some(vehicle), _) =>
@ -5510,12 +5509,14 @@ class WorldSessionActor extends Actor with MDCContextAware {
case _ => case _ =>
true true
})) => })) =>
deadState = DeadState.RespawnTime
cluster ! Zone.Lattice.RequestSpecificSpawnPoint(dest_continent_guid.guid, player, dest_building_guid) cluster ! Zone.Lattice.RequestSpecificSpawnPoint(dest_continent_guid.guid, player, dest_building_guid)
case Some(wg : WarpGate) if(!wg.Active) => case Some(wg : WarpGate) if(!wg.Active) =>
log.info(s"WarpgateRequest: inactive WarpGate") log.info(s"WarpgateRequest: inactive WarpGate")
case _ => case _ =>
deadState = DeadState.RespawnTime
RequestSanctuaryZoneSpawn(player, continent.Number) RequestSanctuaryZoneSpawn(player, continent.Number)
} }
} }