(unstable) [fixed] stability fix
(unstable) [modified] some creature aggro logic

Change-Id: I1e67fac8f72b04550f1d94f10a21e1431280eade