From 3b9b7bce5961b8c04708a4acaf7227debd48c7f2 Mon Sep 17 00:00:00 2001
From: RettichLP <rettichlp01@gmail.com>
Date: Thu, 30 Apr 2026 15:04:21 +0200
Subject: [PATCH] fix: improve emergency service patterns

---
 .../impl/faction/EmergencyServiceListener.java         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/EmergencyServiceListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/EmergencyServiceListener.java
index d114b500..76049104 100644
--- a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/EmergencyServiceListener.java
+++ b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/EmergencyServiceListener.java
@@ -19,13 +19,13 @@
 @UCUtilsListener
 public class EmergencyServiceListener implements IMessageReceiveListener, INaviSpotReachedListener {
 
-    private static final Pattern SERVICE_PATTERN = compile("Ein Notruf von (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) \\((?<message>.+)\\)\\.");
-    private static final Pattern SERVICE_ACCEPTED_PATTERN = compile("^(?:HQ: )?(?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat den Notruf von (?:\\[UC])?(?<senderName>[a-zA-Z0-9_]+) angenommen\\.$");
-    private static final Pattern SERVICE_REQUEUED_PATTERN = compile("^(?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat den Notruf von (?:\\[UC])?(?<senderName>[a-zA-Z0-9_]+) erneut geöffnet\\.$");
+    private static final Pattern SERVICE_PATTERN = compile("Ein Notruf von (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) \\((?<mobileNumber>\\d+)\\): \"(?<message>.+)\"");
+    private static final Pattern SERVICE_ACCEPTED_PATTERN = compile("^(?:HQ: )?(?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat den Notruf von (?:\\[UC])?(?<senderName>[a-zA-Z0-9_]+) angenommen\\. \\((?<distance>\\d+)m entfernt\\)$");
+    private static final Pattern SERVICE_REQUEUED_PATTERN = compile("^(?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat den Notruf von (?:\\[UC])?(?<senderName>[a-zA-Z0-9_]+) \\((?<mobileNumber>\\d+)\\) wieder geöffnet\\.$");
     private static final Pattern SERVICE_DONE_PATTERN = compile("^Du hast den Service von (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) als 'Erledigt' markiert\\.$");
     private static final Pattern SERVICE_ABORTED_PATTERN = compile("^Der Service von (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) wurde abgebrochen\\.$");
-    private static final Pattern SERVICE_DELETED_PATTERN = compile("^(?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat den Notruf von (?:\\[UC])?(?<senderName>[a-zA-Z0-9_]+) gelöscht\\.$");
-    private static final Pattern SERVICE_COUNT_PATTERN = compile("^Offene Notrufe \\((?<count>\\d+)\\)$");
+    private static final Pattern SERVICE_DELETED_PATTERN = compile("^Der Notruf von (?:\\[UC])?(?<senderName>[a-zA-Z0-9_]+) wurde von (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) gelöscht\\.$");
+    private static final Pattern SERVICE_COUNT_PATTERN = compile("^Offene Notrufe \\((?<count>\\d+)\\):");
     private static final Pattern SERVICE_NONE_PATTERN = compile("^Fehler: Es ist kein Service offen\\.$");
 
     private boolean activeService = false;