From 98e5840369e90483ae0c0248859b88d33ac83e64 Mon Sep 17 00:00:00 2001
From: Kate Martin <51387586+renanthera@users.noreply.github.com>
Date: Sun, 23 Aug 2026 21:17:09 -0600
Subject: [PATCH] [paladin] Fix simulator getting stuck when using channeled
 trinkets too early.

---
 engine/class_modules/paladin/sc_paladin.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engine/class_modules/paladin/sc_paladin.cpp b/engine/class_modules/paladin/sc_paladin.cpp
index 77dc71e8fdb..84cef8733c6 100644
--- a/engine/class_modules/paladin/sc_paladin.cpp
+++ b/engine/class_modules/paladin/sc_paladin.cpp
@@ -972,10 +972,11 @@ struct melee_t : public paladin_melee_attack_t
   {
     if ( !player->in_combat )
       return 10_ms;
-    if ( first )
+
+    if ( first && !player->channeling )
       return 0_ms;
-    else
-      return paladin_melee_attack_t::execute_time();
+
+    return paladin_melee_attack_t::execute_time();
   }
 
   void execute() override