chore(map): exclude jita from jump targets

updraft0 · Sep 24, 2024 · 53fd768 · 53fd768
1 parent cfdd34f
commit 53fd768
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/constant/src/main/scala/org/updraft0/controltower/constant/magic.scala b/constant/src/main/scala/org/updraft0/controltower/constant/magic.scala
@@ -1,6 +1,6 @@
 package org.updraft0.controltower.constant
 
-/** Magic constants (that are hard to put anywhere else)
+/** Magic constants live here instead of being sprinkled around the codebase. Might as well keep them in one place.
   */
 object MagicConstant:
   // The grid snapping of a system map
@@ -14,7 +14,6 @@ object MagicConstant:
   val CharacterImageSize: Int = 32
 
   // Systems
-  // TODO use
   val Jita: SystemId = SystemId(30000142)
 
   // UI elements

diff --git a/server/src/main/scala/org/updraft0/controltower/server/map/MapReactive.scala b/server/src/main/scala/org/updraft0/controltower/server/map/MapReactive.scala
@@ -929,8 +929,9 @@ object MapEntity extends ReactiveEntity[MapEnv, MapId, MapState, Identified[MapR
   private def isPotentialWormholeJump(state: MapState, fromSystemId: SystemId, toSystemId: SystemId) =
     val differentSystem = fromSystemId != toSystemId
     val noGate          = !state.hasGateBetween(fromSystemId, toSystemId)
+    val notJita         = fromSystemId != MagicConstant.Jita && toSystemId != MagicConstant.Jita
     val isTarget        = state.refSystem(fromSystemId).zip(state.refSystem(toSystemId)).exists(isTargetForJumps)
-    differentSystem && noGate && isTarget
+    differentSystem && noGate && notJita && isTarget
 
   private def isKnownSpace(state: MapState, systemId: SystemId) =
     state.refSystem(systemId).exists(_.whClass.spaceType == SpaceType.Known)