From a63aa95d24e791ef2c6542608c39bae66e26508b Mon Sep 17 00:00:00 2001
From: Resaec <resaecscript@googlemail.com>
Date: Tue, 24 Oct 2023 00:30:59 +0200
Subject: [PATCH 1/2] Fixed 7 door GUIDs

---
 src/main/resources/zonemaps/ugd02.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/zonemaps/ugd02.json b/src/main/resources/zonemaps/ugd02.json
index 78b96753..e5941ae0 100644
--- a/src/main/resources/zonemaps/ugd02.json
+++ b/src/main/resources/zonemaps/ugd02.json
@@ -12787,7 +12787,7 @@
     "AbsY": 1523.68127,
     "AbsZ": 226.779,
     "Yaw": 74.0,
-    "GUID": 1038,
+    "GUID": 1039,
     "MapID": null,
     "IsChildObject": true
   },
@@ -12800,7 +12800,7 @@
     "AbsY": 990.166,
     "AbsZ": 220.185,
     "Yaw": 90.0,
-    "GUID": 1039,
+    "GUID": 1038,
     "MapID": null,
     "IsChildObject": true
   },
@@ -12995,7 +12995,7 @@
     "AbsY": 1352.12842,
     "AbsZ": 294.999,
     "Yaw": 300.0,
-    "GUID": 1054,
+    "GUID": 1055,
     "MapID": null,
     "IsChildObject": true
   },
@@ -13008,7 +13008,7 @@
     "AbsY": 1510.51892,
     "AbsZ": 226.179,
     "Yaw": 306.0,
-    "GUID": 1055,
+    "GUID": 1056,
     "MapID": null,
     "IsChildObject": true
   },
@@ -13021,7 +13021,7 @@
     "AbsY": 527.16,
     "AbsZ": 219.839,
     "Yaw": 180.0,
-    "GUID": 1056,
+    "GUID": 1054,
     "MapID": null,
     "IsChildObject": true
   },
@@ -13463,7 +13463,7 @@
     "AbsY": 1066.67053,
     "AbsZ": 242.868988,
     "Yaw": 47.0,
-    "GUID": 1090,
+    "GUID": 1091,
     "MapID": null,
     "IsChildObject": true
   },
@@ -13476,7 +13476,7 @@
     "AbsY": 1436.58289,
     "AbsZ": 245.778992,
     "Yaw": 6.0,
-    "GUID": 1091,
+    "GUID": 1090,
     "MapID": null,
     "IsChildObject": true
   },

From 9e76fcc42accaf8c6de2a6e4edbf58ac89480193 Mon Sep 17 00:00:00 2001
From: ScrawnyRonnie <73139382+ScrawnyRonnie@users.noreply.github.com>
Date: Tue, 7 Nov 2023 21:38:28 -0500
Subject: [PATCH 2/2] Update EffectTarget.scala

Set back to findLast after review
---
 .../scala/net/psforever/objects/equipment/EffectTarget.scala    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala b/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala
index 2f5e404d..0b119f3e 100644
--- a/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala
+++ b/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala
@@ -85,7 +85,7 @@ object EffectTarget {
 
     private def CommonRepairConditions(v: Vehicle): Boolean = {
       v.Health > 0 && v.Health < v.MaxHealth &&
-        (v.History.find { entry => entry.isInstanceOf[DamagingActivity] } match {
+        (v.History.findLast { entry => entry.isInstanceOf[DamagingActivity] } match {
           case Some(entry) if System.currentTimeMillis() - entry.time < 5000L => false
           case _ => true
         })