Fixed missing map id boundary checking

Signed-off-by: shennetsind <ind@henn.et>
Follow up 144a9d0843dfe47e0b58c8857762f58ae70543c8

fixed counter going off if target died while timer was running.

Signed-off-by: shennetsind <ind@henn.et>
Merge branch 'master' of https://github.com/HerculesWS/Hercules