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

Merge pull request #1267 from ScrawnyRonnie/favorites

Browse source 
Enemy Faction Equipment in Favorites
This commit is contained in:
ScrawnyRonnie 2025-05-22 12:18:25 -04:00 committed by GitHub
parent a0149cddcf 5d00a10e80
commit 60f02b473d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala
View file

@ -678,8 +678,8 @@ object ContainableBehavior {
val faction = GlobalDefinitions.isFactionEquipment(objDef) val faction = GlobalDefinitions.isFactionEquipment(objDef)
GlobalDefinitions.isCavernEquipment(objDef) || GlobalDefinitions.isCavernEquipment(objDef) ||
objDef == GlobalDefinitions.router_telepad || objDef == GlobalDefinitions.router_telepad ||
entry.obj.isInstanceOf[BoomerTrigger] || entry.obj.isInstanceOf[BoomerTrigger] /*||
(faction != tplayer.Faction && faction != PlanetSideEmpire.NEUTRAL) (faction != tplayer.Faction && faction != PlanetSideEmpire.NEUTRAL)*/
} }
} }