fea267ea78
Fixes https://github.com/vmangos/core/issues/1731 Fixes https://github.com/vmangos/core/issues/1730
Fixes https://github.com/vmangos/core/issues/1731 Fixes https://github.com/vmangos/core/issues/1730