GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Interaction Hotfix

Browse source 
Fixed exception when attempting to dock or enter wormhole
This commit is contained in:
Reinier Vens 2021-05-12 01:41:18 +01:00
commit 3f91b13d28
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Assets/Scripts/ServerShared/Entity.cs
View file

@ -288,9 +288,15 @@ public abstract class Entity
}
// TODO: Inter-faction relationships
public FactionRelationship GetFactionRelationship(Faction faction) =>
this is Ship {IsPlayerShip: true} ? Zone.Sector.FactionRelationships[faction] : faction==Faction ? FactionRelationship.Beloved : FactionRelationship.Neutral;
public FactionRelationship GetFactionRelationship(Faction faction)
{
if (faction == null)
return FactionRelationship.Neutral;
if (this is Ship {IsPlayerShip: true})
return Zone.Sector.FactionRelationships[faction];
return faction.ID == Faction.ID ? FactionRelationship.Beloved : FactionRelationship.Neutral;
}
public static bool IsPresencePermitted(FactionRelationship relationship, SecurityLevel securityLevel) =>
(int) relationship - (int) securityLevel > 0;
public static bool IsDockingPermitted(FactionRelationship relationship, SecurityLevel securityLevel) =>