1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-28 20:27:46 +00:00

Merge branch 'misc_fix' into develop_c

This commit is contained in:
collett 2020-01-14 22:11:18 +09:00
commit 09a596183b

View file

@ -836,7 +836,7 @@ float Action::Action::getAnimationLock()
return 0.1f; return 0.1f;
} }
} }
return 0.6f; return hasCastTime() ? 0.1f : 0.6f;
} }
Action::EffectBuilderPtr Action::Action::getEffectbuilder() Action::EffectBuilderPtr Action::Action::getEffectbuilder()