fixed data link

Author: 1whohears

src/main/java/com/onewhohears/dscombat/data/radar/RadarData.java

@@ -170,7 +170,7 @@ private void scanAircraft(EntityAircraft radar, Entity controller, List<RadarPin
 			RadarPing p = new RadarPing(ea, checkFriendly(controller, pilot));
 			vehiclePings.add(p);
 			pings.add(p);
-			ea.lockedOnto(radar.position());
+			if (!radar.isAlliedTo(ea)) ea.lockedOnto(radar.position());
 		}
 	}
 
@@ -337,6 +337,12 @@ public String toString() {
 			return "PING["+(int)pos.x+","+(int)pos.y+","+(int)pos.z+"]";
 		}
 
+		@Override
+		public boolean equals(Object o) {
+			if (o instanceof RadarPing ping && ping.id == this.id) return true;
+			return false;
+		}
+		
 	}
 
 	public static enum RadarMode {

src/main/java/com/onewhohears/dscombat/data/radar/RadarSystem.java

@@ -93,22 +93,23 @@ public void tickUpdateTargets() {
 		// PLANE RADARS
 		for (RadarData r : radars) r.tickUpdateTargets(parent, targets);
 		// DATA LINK
-		if (dataLink && parent.level.getGameTime() % 20 == 0) {
+		if (dataLink && parent.tickCount % 20 == 0) {
 			for (int i = 0; i < dataLinkTargets.size(); ++i) targets.remove(dataLinkTargets.get(i));
 			dataLinkTargets.clear();
 			Entity controller = parent.getControllingPassenger();
 			if (!(controller instanceof Player player)) return;
 			List<? extends Player> players = parent.level.players();
 			for (Player p : players) {
 				if (player.equals(p)) continue;
-				if (player.isAlliedTo(p)) {
-					if (p.getRootVehicle() instanceof EntityAircraft plane) {
-						if (plane.equals(parent)) continue;
-						for (RadarPing rp : targets) { // FIXME 1 data link is broken (concurrent modification exception)
-							plane.radarSystem.dataLinkTargets.add(rp);
-							plane.radarSystem.targets.add(rp);
-						}
-					}
+				if (!player.isAlliedTo(p)) continue;
+				if (!(p.getRootVehicle() instanceof EntityAircraft plane)) continue;
+				if (!plane.radarSystem.dataLink) continue;
+				if (plane.equals(parent)) continue;
+				for (RadarPing rp : plane.radarSystem.targets) {
+					if (rp.id == parent.getId()) continue;
+					if (hasTarget(rp.id)) continue;
+					targets.add(rp);
+					dataLinkTargets.add(rp);
 				}
 			}
 		}
@@ -128,6 +129,11 @@ public void tickUpdateTargets() {
 				new ToClientRadarPings(parent.getId(), targets));
 	}
 
+	private boolean hasTarget(int id) {
+		for (RadarPing rp : targets) if (rp.id == id) return true;
+		return false;
+	}
+	
 	private void updateRockets() {
 		for (int i = 0; i < rockets.size(); ++i) {
 			EntityMissile r = rockets.get(i);

src/main/java/com/onewhohears/dscombat/entity/aircraft/EntityAircraft.java

@@ -993,7 +993,7 @@ private void tickLerp() {
 	        --lerpSteps;
 	        setPos(d0, d1, d2);
 		}
-		// FIXME 0 rotation lerp
+		// FIXME 0 aircraft rotation lerp
         /*if (lerpStepsQ > 0) {
             setClientQ(UtilAngles.lerpQ(1 / lerpStepsQ, getPrevQ(), getQ()));
             --lerpStepsQ;