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])?(?[a-zA-Z0-9_]+) \\((?.+)\\)\\."); - private static final Pattern SERVICE_ACCEPTED_PATTERN = compile("^(?:HQ: )?(?:\\[UC])?(?[a-zA-Z0-9_]+) hat den Notruf von (?:\\[UC])?(?[a-zA-Z0-9_]+) angenommen\\.$"); - private static final Pattern SERVICE_REQUEUED_PATTERN = compile("^(?:\\[UC])?(?[a-zA-Z0-9_]+) hat den Notruf von (?:\\[UC])?(?[a-zA-Z0-9_]+) erneut geöffnet\\.$"); + private static final Pattern SERVICE_PATTERN = compile("Ein Notruf von (?:\\[UC])?(?[a-zA-Z0-9_]+) \\((?\\d+)\\): \"(?.+)\""); + private static final Pattern SERVICE_ACCEPTED_PATTERN = compile("^(?:HQ: )?(?:\\[UC])?(?[a-zA-Z0-9_]+) hat den Notruf von (?:\\[UC])?(?[a-zA-Z0-9_]+) angenommen\\. \\((?\\d+)m entfernt\\)$"); + private static final Pattern SERVICE_REQUEUED_PATTERN = compile("^(?:\\[UC])?(?[a-zA-Z0-9_]+) hat den Notruf von (?:\\[UC])?(?[a-zA-Z0-9_]+) \\((?\\d+)\\) wieder geöffnet\\.$"); private static final Pattern SERVICE_DONE_PATTERN = compile("^Du hast den Service von (?:\\[UC])?(?[a-zA-Z0-9_]+) als 'Erledigt' markiert\\.$"); private static final Pattern SERVICE_ABORTED_PATTERN = compile("^Der Service von (?:\\[UC])?(?[a-zA-Z0-9_]+) wurde abgebrochen\\.$"); - private static final Pattern SERVICE_DELETED_PATTERN = compile("^(?:\\[UC])?(?[a-zA-Z0-9_]+) hat den Notruf von (?:\\[UC])?(?[a-zA-Z0-9_]+) gelöscht\\.$"); - private static final Pattern SERVICE_COUNT_PATTERN = compile("^Offene Notrufe \\((?\\d+)\\)$"); + private static final Pattern SERVICE_DELETED_PATTERN = compile("^Der Notruf von (?:\\[UC])?(?[a-zA-Z0-9_]+) wurde von (?:\\[UC])?(?[a-zA-Z0-9_]+) gelöscht\\.$"); + private static final Pattern SERVICE_COUNT_PATTERN = compile("^Offene Notrufe \\((?\\d+)\\):"); private static final Pattern SERVICE_NONE_PATTERN = compile("^Fehler: Es ist kein Service offen\\.$"); private boolean activeService = false;