[Druid] Fix assertion error with shapeshift to no form.

yuyuyzl · Oct 28, 2017 · 16d8bbd · 16d8bbd
1 parent 6f00866
commit 16d8bbd
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/engine/class_modules/sc_druid.cpp b/engine/class_modules/sc_druid.cpp
@@ -4680,6 +4680,7 @@ struct regrowth_t: public druid_heal_t
     druid_heal_t( "regrowth", p, p -> find_class_spell( "Regrowth" ), options_str )
   {
     form_mask = NO_FORM | MOONKIN_FORM;
+    may_autounshift = true;
     ignore_false_positive = true;
 
 
@@ -7782,6 +7783,8 @@ void druid_t::apl_feral()
    st->add_action("rake,if=buff.prowl.up|buff.shadowmeld.up");
    st->add_action("call_action_list,name=cooldowns");
    st->add_action("regrowth,if=combo_points=5&talent.bloodtalons.enabled&buff.bloodtalons.down&(!buff.incarnation.up|dot.rip.remains<8|dot.rake.remains<5)");
+   st->add_action("regrowth,if=talent.bloodtalons.enabled&buff.bloodtalons.down&buff.apex_predator.up");
+   st->add_action("ferocious_bite,max_energy=1,if=buff.apex_predator.up");
    st->add_action("run_action_list,name=st_finishers,if=combo_points>4");
    st->add_action("run_action_list,name=st_generators");
 
@@ -9308,6 +9311,10 @@ void druid_t::shapeshift( form_e f )
   case MOONKIN_FORM_AFFINITY:
     buff.moonkin_form_affinity -> trigger();
     break;
+  case NO_FORM:
+     if ( buff.rage_of_the_sleeper -> check() )
+        buff.rage_of_the_sleeper -> expire();
+     break;
   default:
     assert( 0 );
     break;