Merge branch 'master' into quadtree-rework-and-tests

src/map.cpp

@@ -112,7 +112,7 @@ void Map::removeTile(uint16_t x, uint16_t y, uint8_t z)
 	if (const CreatureVector* creatures = tile->getCreatures()) {
 		for (int32_t i = creatures->size(); --i >= 0;) {
 			if (Player* player = (*creatures)[i]->getPlayer()) {
-				g_game.internalTeleport(player, player->getTown()->getTemplePosition(), false, FLAG_NOLIMIT);
+				g_game.internalTeleport(player, player->getTown()->templePosition, false, FLAG_NOLIMIT);
 			} else {
 				g_game.removeCreature((*creatures)[i]);
 			}