Cancel a maintenance pay request after one vehicle click

src/main/java/net/tfminecraft/simplefactions/vehicles/maintenance/VehicleMaintenancePayListener.java

@@ -39,14 +39,20 @@ public void onVehiclePreInteract(VehiclePreInteractEvent event) {
             return;
         }
 
+        pay(leader, session, vehicle.getUUID(), vehicle.getId());
+    }
+
+    void pay(Player leader, VehicleMaintenancePaySession session, String vehicleUuid, String vehicleTypeId) {
         VehicleMaintenancePayResult result = payService.tryPay(
                 leader.getUniqueId(),
-                vehicle.getUUID(),
-                vehicle.getId(),
+                vehicleUuid,
+                vehicleTypeId,
                 session.getPaymentSource());
+        // One click per armed command, whatever the outcome, so a failed payment
+        // does not keep swallowing vehicle interactions until the session expires.
+        sessionManager.clear(leader.getUniqueId());
         switch (result) {
             case SUCCESS -> {
-                sessionManager.clear(leader.getUniqueId());
                 SimpleFactions plugin = SimpleFactions.getInstance();
                 if (plugin != null) {
                     plugin.saveVehicleRegistry();

src/test/java/net/tfminecraft/simplefactions/vehicles/maintenance/VehicleMaintenanceBankCommandTest.java

@@ -127,4 +127,28 @@ void expiredBankSessionCannotCharge() {
         assertNull(sessions.get(payer));
         verifyNoInteractions(service);
     }
+
+    @Test
+    void failedPaymentDisarmsSessionSoLaterClicksReachTheVehicle() {
+        Player player = mock(Player.class);
+        UUID payer = UUID.randomUUID();
+        when(player.getUniqueId()).thenReturn(payer);
+        var sessions = new VehicleMaintenancePaySessionManager();
+        var session = new VehicleMaintenancePaySessionManager.VehicleMaintenancePaySession(
+                System.currentTimeMillis() + 60_000, PaymentSource.BANK);
+        sessions.put(payer, session);
+        var service = mock(VehicleMaintenancePayService.class);
+        when(service.tryPay(payer, "vehicle-uuid", "cog", PaymentSource.BANK))
+                .thenReturn(VehicleMaintenancePayService.VehicleMaintenancePayResult.NOT_UNPAID);
+        var listener = new VehicleMaintenancePayListener(sessions, service);
+
+        listener.pay(player, session, "vehicle-uuid", "cog");
+        verify(player).sendMessage(VehicleMaintenanceMessages.notUnpaid());
+        assertNull(sessions.get(payer));
+
+        var nextClick = new VehiclePreInteractEvent(player, null);
+        listener.onVehiclePreInteract(nextClick);
+        assertFalse(nextClick.isCancelled());
+        verify(service, times(1)).tryPay(any(), any(), any(), any());
+    }
 }