From 13fd3a1747ade8d15bcfcdc5fbb8e05548bcadba Mon Sep 17 00:00:00 2001
From: Ziggy <ziggyswg@outlook.com>
Date: Sat, 12 Dec 2020 11:47:01 +0100
Subject: [PATCH] PvP zones are now only applied to the intended planet instead
 of every planet #290

---
 .../services/gameplay/faction/FactionFlagService.java        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/faction/FactionFlagService.java b/src/main/java/com/projectswg/holocore/services/gameplay/faction/FactionFlagService.java
index f162f57c8..4440ec912 100644
--- a/src/main/java/com/projectswg/holocore/services/gameplay/faction/FactionFlagService.java
+++ b/src/main/java/com/projectswg/holocore/services/gameplay/faction/FactionFlagService.java
@@ -281,6 +281,11 @@ public class FactionFlagService extends Service {
 		return pvpZones.values().stream()
 				.anyMatch(pvpZone -> {
 					Location zoneLocation = pvpZone.getLocation();
+					
+					if (location.getTerrain() != zoneLocation.getTerrain()) {
+						return false;
+					}
+					
 					double radius = pvpZone.getRadius();
 					
 					return location.isWithinFlatDistance(zoneLocation, radius);